diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/acornfb.c | 2 | ||||
-rw-r--r-- | drivers/video/clps711xfb.c | 2 | ||||
-rw-r--r-- | drivers/video/imxfb.c | 2 | ||||
-rw-r--r-- | drivers/video/omap/omapfb_main.c | 1 | ||||
-rw-r--r-- | drivers/video/pxafb.c | 2 | ||||
-rw-r--r-- | drivers/video/sa1100fb.c | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c index 017233d0c481..bad26c65d9bf 100644 --- a/drivers/video/acornfb.c +++ b/drivers/video/acornfb.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/platform_device.h> | 29 | #include <linux/platform_device.h> |
30 | #include <linux/dma-mapping.h> | 30 | #include <linux/dma-mapping.h> |
31 | 31 | ||
32 | #include <asm/hardware.h> | 32 | #include <asm/arch/hardware.h> |
33 | #include <asm/io.h> | 33 | #include <asm/io.h> |
34 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
35 | #include <asm/mach-types.h> | 35 | #include <asm/mach-types.h> |
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c index 9f8a389dc7ae..3701caa367e4 100644 --- a/drivers/video/clps711xfb.c +++ b/drivers/video/clps711xfb.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <linux/proc_fs.h> | 27 | #include <linux/proc_fs.h> |
28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
29 | 29 | ||
30 | #include <asm/hardware.h> | 30 | #include <asm/arch/hardware.h> |
31 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
32 | #include <linux/uaccess.h> | 32 | #include <linux/uaccess.h> |
33 | 33 | ||
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index 0c5a475c1cae..d28879fd3a29 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
35 | 35 | ||
36 | #include <asm/hardware.h> | 36 | #include <asm/arch/hardware.h> |
37 | #include <asm/io.h> | 37 | #include <asm/io.h> |
38 | #include <asm/arch/imxfb.h> | 38 | #include <asm/arch/imxfb.h> |
39 | 39 | ||
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index f85af5c4fa68..d9abc48a210b 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
29 | #include <linux/uaccess.h> | 29 | #include <linux/uaccess.h> |
30 | 30 | ||
31 | #include <asm/mach-types.h> | ||
32 | #include <asm/arch/dma.h> | 31 | #include <asm/arch/dma.h> |
33 | #include <asm/arch/omapfb.h> | 32 | #include <asm/arch/omapfb.h> |
34 | 33 | ||
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 69de2fed6c58..3169ea4831ef 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <linux/kthread.h> | 45 | #include <linux/kthread.h> |
46 | #include <linux/freezer.h> | 46 | #include <linux/freezer.h> |
47 | 47 | ||
48 | #include <asm/hardware.h> | 48 | #include <asm/arch/hardware.h> |
49 | #include <asm/io.h> | 49 | #include <asm/io.h> |
50 | #include <asm/irq.h> | 50 | #include <asm/irq.h> |
51 | #include <asm/div64.h> | 51 | #include <asm/div64.h> |
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 78bcdbc3f484..8fbcce6d069d 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c | |||
@@ -177,7 +177,7 @@ | |||
177 | #include <linux/dma-mapping.h> | 177 | #include <linux/dma-mapping.h> |
178 | #include <linux/mutex.h> | 178 | #include <linux/mutex.h> |
179 | 179 | ||
180 | #include <asm/hardware.h> | 180 | #include <asm/arch/hardware.h> |
181 | #include <asm/io.h> | 181 | #include <asm/io.h> |
182 | #include <asm/mach-types.h> | 182 | #include <asm/mach-types.h> |
183 | #include <asm/arch/assabet.h> | 183 | #include <asm/arch/assabet.h> |