projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irq/threaded' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[linux-block.git]
/
drivers
/
video
/
acornfb.c
diff --git
a/drivers/video/acornfb.c
b/drivers/video/acornfb.c
index 61c3d3f40fd180463df2967d2a3373f644b0244c..6995fe1e86d4aae1ad5abd6535e65572f1a59316 100644
(file)
--- a/
drivers/video/acornfb.c
+++ b/
drivers/video/acornfb.c
@@
-28,9
+28,9
@@
#include <linux/fb.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
#include <asm/pgtable.h>