diff options
Diffstat (limited to 'drivers/video')
29 files changed, 63 insertions, 63 deletions
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c index bad26c65d9bf..61c3d3f40fd1 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/arch/hardware.h> | 32 | #include <mach/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> |
@@ -339,7 +339,7 @@ acornfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, | |||
339 | #endif | 339 | #endif |
340 | 340 | ||
341 | #ifdef HAS_VIDC20 | 341 | #ifdef HAS_VIDC20 |
342 | #include <asm/arch/acornfb.h> | 342 | #include <mach/acornfb.h> |
343 | 343 | ||
344 | #define MAX_SIZE 2*1024*1024 | 344 | #define MAX_SIZE 2*1024*1024 |
345 | 345 | ||
diff --git a/drivers/video/am200epd.c b/drivers/video/am200epd.c index 32dd85126931..0c35b8b0160e 100644 --- a/drivers/video/am200epd.c +++ b/drivers/video/am200epd.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #include <video/metronomefb.h> | 34 | #include <video/metronomefb.h> |
35 | 35 | ||
36 | #include <asm/arch/pxa-regs.h> | 36 | #include <mach/pxa-regs.h> |
37 | 37 | ||
38 | /* register offsets for gpio control */ | 38 | /* register offsets for gpio control */ |
39 | #define LED_GPIO_PIN 51 | 39 | #define LED_GPIO_PIN 51 |
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 5b3a15dffb5f..e7018a2f56af 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
@@ -18,9 +18,9 @@ | |||
18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
19 | #include <linux/backlight.h> | 19 | #include <linux/backlight.h> |
20 | 20 | ||
21 | #include <asm/arch/board.h> | 21 | #include <mach/board.h> |
22 | #include <asm/arch/cpu.h> | 22 | #include <mach/cpu.h> |
23 | #include <asm/arch/gpio.h> | 23 | #include <mach/gpio.h> |
24 | 24 | ||
25 | #include <video/atmel_lcdc.h> | 25 | #include <video/atmel_lcdc.h> |
26 | 26 | ||
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c index 891875d53a49..cbad67e89826 100644 --- a/drivers/video/backlight/omap1_bl.c +++ b/drivers/video/backlight/omap1_bl.c | |||
@@ -25,9 +25,9 @@ | |||
25 | #include <linux/fb.h> | 25 | #include <linux/fb.h> |
26 | #include <linux/backlight.h> | 26 | #include <linux/backlight.h> |
27 | 27 | ||
28 | #include <asm/arch/hardware.h> | 28 | #include <mach/hardware.h> |
29 | #include <asm/arch/board.h> | 29 | #include <mach/board.h> |
30 | #include <asm/arch/mux.h> | 30 | #include <mach/mux.h> |
31 | 31 | ||
32 | #define OMAPBL_MAX_INTENSITY 0xff | 32 | #define OMAPBL_MAX_INTENSITY 0xff |
33 | 33 | ||
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c index 3701caa367e4..16f5db471ab5 100644 --- a/drivers/video/clps711xfb.c +++ b/drivers/video/clps711xfb.c | |||
@@ -27,12 +27,12 @@ | |||
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/arch/hardware.h> | 30 | #include <mach/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 | ||
34 | #include <asm/hardware/clps7111.h> | 34 | #include <asm/hardware/clps7111.h> |
35 | #include <asm/arch/syspld.h> | 35 | #include <mach/syspld.h> |
36 | 36 | ||
37 | struct fb_info *cfb; | 37 | struct fb_info *cfb; |
38 | 38 | ||
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index d0e4cb618269..41d62632dcdb 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c | |||
@@ -1425,7 +1425,7 @@ static void cyberpro_common_resume(struct cfb_info *cfb) | |||
1425 | 1425 | ||
1426 | #ifdef CONFIG_ARCH_SHARK | 1426 | #ifdef CONFIG_ARCH_SHARK |
1427 | 1427 | ||
1428 | #include <asm/arch/hardware.h> | 1428 | #include <mach/hardware.h> |
1429 | 1429 | ||
1430 | static int __devinit cyberpro_vl_probe(void) | 1430 | static int __devinit cyberpro_vl_probe(void) |
1431 | { | 1431 | { |
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c index cc2810ef5de5..2735b79e52a1 100644 --- a/drivers/video/epson1355fb.c +++ b/drivers/video/epson1355fb.c | |||
@@ -71,7 +71,7 @@ struct epson1355_par { | |||
71 | #if defined(CONFIG_ARM) | 71 | #if defined(CONFIG_ARM) |
72 | 72 | ||
73 | # ifdef CONFIG_ARCH_CEIVA | 73 | # ifdef CONFIG_ARCH_CEIVA |
74 | # include <asm/arch/hardware.h> | 74 | # include <mach/hardware.h> |
75 | # define EPSON1355FB_BASE_PHYS (CEIVA_PHYS_SED1355) | 75 | # define EPSON1355FB_BASE_PHYS (CEIVA_PHYS_SED1355) |
76 | # endif | 76 | # endif |
77 | 77 | ||
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index d28879fd3a29..ccd986140c95 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c | |||
@@ -33,9 +33,9 @@ | |||
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/arch/hardware.h> | 36 | #include <mach/hardware.h> |
37 | #include <asm/io.h> | 37 | #include <asm/io.h> |
38 | #include <asm/arch/imxfb.h> | 38 | #include <mach/imxfb.h> |
39 | 39 | ||
40 | /* | 40 | /* |
41 | * Complain if VAR is out of range. | 41 | * Complain if VAR is out of range. |
diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c index 4d8ad9cd0e19..9dfcf39d3367 100644 --- a/drivers/video/omap/blizzard.c +++ b/drivers/video/omap/blizzard.c | |||
@@ -26,9 +26,9 @@ | |||
26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
28 | 28 | ||
29 | #include <asm/arch/dma.h> | 29 | #include <mach/dma.h> |
30 | #include <asm/arch/omapfb.h> | 30 | #include <mach/omapfb.h> |
31 | #include <asm/arch/blizzard.h> | 31 | #include <mach/blizzard.h> |
32 | 32 | ||
33 | #include "dispc.h" | 33 | #include "dispc.h" |
34 | 34 | ||
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index ab77c51fe9d6..6efcf89e7fbe 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c | |||
@@ -25,9 +25,9 @@ | |||
25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
27 | 27 | ||
28 | #include <asm/arch/sram.h> | 28 | #include <mach/sram.h> |
29 | #include <asm/arch/omapfb.h> | 29 | #include <mach/omapfb.h> |
30 | #include <asm/arch/board.h> | 30 | #include <mach/board.h> |
31 | 31 | ||
32 | #include "dispc.h" | 32 | #include "dispc.h" |
33 | 33 | ||
diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c index 1e642b7a20fe..f24df0b54e1c 100644 --- a/drivers/video/omap/hwa742.c +++ b/drivers/video/omap/hwa742.c | |||
@@ -26,9 +26,9 @@ | |||
26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
28 | 28 | ||
29 | #include <asm/arch/dma.h> | 29 | #include <mach/dma.h> |
30 | #include <asm/arch/omapfb.h> | 30 | #include <mach/omapfb.h> |
31 | #include <asm/arch/hwa742.h> | 31 | #include <mach/hwa742.h> |
32 | 32 | ||
33 | #define HWA742_REV_CODE_REG 0x0 | 33 | #define HWA742_REV_CODE_REG 0x0 |
34 | #define HWA742_CONFIG_REG 0x2 | 34 | #define HWA742_CONFIG_REG 0x2 |
diff --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c index 31e978349a80..2486237ebba5 100644 --- a/drivers/video/omap/lcd_h3.c +++ b/drivers/video/omap/lcd_h3.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/i2c/tps65010.h> | 24 | #include <linux/i2c/tps65010.h> |
25 | 25 | ||
26 | #include <asm/arch/gpio.h> | 26 | #include <mach/gpio.h> |
27 | #include <asm/arch/omapfb.h> | 27 | #include <mach/omapfb.h> |
28 | 28 | ||
29 | #define MODULE_NAME "omapfb-lcd_h3" | 29 | #define MODULE_NAME "omapfb-lcd_h3" |
30 | 30 | ||
diff --git a/drivers/video/omap/lcd_h4.c b/drivers/video/omap/lcd_h4.c index fd6f0eb16de1..88c19d424ef7 100644 --- a/drivers/video/omap/lcd_h4.c +++ b/drivers/video/omap/lcd_h4.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | 24 | ||
25 | #include <asm/arch/omapfb.h> | 25 | #include <mach/omapfb.h> |
26 | 26 | ||
27 | static int h4_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) | 27 | static int h4_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) |
28 | { | 28 | { |
diff --git a/drivers/video/omap/lcd_inn1510.c b/drivers/video/omap/lcd_inn1510.c index 551f385861d1..6953ed4b5820 100644 --- a/drivers/video/omap/lcd_inn1510.c +++ b/drivers/video/omap/lcd_inn1510.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
25 | 25 | ||
26 | #include <asm/arch/fpga.h> | 26 | #include <mach/fpga.h> |
27 | #include <asm/arch/omapfb.h> | 27 | #include <mach/omapfb.h> |
28 | 28 | ||
29 | static int innovator1510_panel_init(struct lcd_panel *panel, | 29 | static int innovator1510_panel_init(struct lcd_panel *panel, |
30 | struct omapfb_device *fbdev) | 30 | struct omapfb_device *fbdev) |
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c index 5ef119c813e0..6a42c6a0cd99 100644 --- a/drivers/video/omap/lcd_inn1610.c +++ b/drivers/video/omap/lcd_inn1610.c | |||
@@ -22,8 +22,8 @@ | |||
22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | 24 | ||
25 | #include <asm/arch/gpio.h> | 25 | #include <mach/gpio.h> |
26 | #include <asm/arch/omapfb.h> | 26 | #include <mach/omapfb.h> |
27 | 27 | ||
28 | #define MODULE_NAME "omapfb-lcd_h3" | 28 | #define MODULE_NAME "omapfb-lcd_h3" |
29 | 29 | ||
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c index a38038840fd6..a4a725f427a4 100644 --- a/drivers/video/omap/lcd_osk.c +++ b/drivers/video/omap/lcd_osk.c | |||
@@ -23,9 +23,9 @@ | |||
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | 25 | ||
26 | #include <asm/arch/gpio.h> | 26 | #include <mach/gpio.h> |
27 | #include <asm/arch/mux.h> | 27 | #include <mach/mux.h> |
28 | #include <asm/arch/omapfb.h> | 28 | #include <mach/omapfb.h> |
29 | 29 | ||
30 | static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) | 30 | static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) |
31 | { | 31 | { |
diff --git a/drivers/video/omap/lcd_palmte.c b/drivers/video/omap/lcd_palmte.c index 52bdfdac42c9..218317366e6e 100644 --- a/drivers/video/omap/lcd_palmte.c +++ b/drivers/video/omap/lcd_palmte.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
25 | 25 | ||
26 | #include <asm/arch/fpga.h> | 26 | #include <mach/fpga.h> |
27 | #include <asm/arch/omapfb.h> | 27 | #include <mach/omapfb.h> |
28 | 28 | ||
29 | static int palmte_panel_init(struct lcd_panel *panel, | 29 | static int palmte_panel_init(struct lcd_panel *panel, |
30 | struct omapfb_device *fbdev) | 30 | struct omapfb_device *fbdev) |
diff --git a/drivers/video/omap/lcd_palmtt.c b/drivers/video/omap/lcd_palmtt.c index 4bb349f54356..57b0f6cf6a5a 100644 --- a/drivers/video/omap/lcd_palmtt.c +++ b/drivers/video/omap/lcd_palmtt.c | |||
@@ -29,8 +29,8 @@ GPIO13 - screen blanking | |||
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | 31 | ||
32 | #include <asm/arch/gpio.h> | 32 | #include <mach/gpio.h> |
33 | #include <asm/arch/omapfb.h> | 33 | #include <mach/omapfb.h> |
34 | 34 | ||
35 | static int palmtt_panel_init(struct lcd_panel *panel, | 35 | static int palmtt_panel_init(struct lcd_panel *panel, |
36 | struct omapfb_device *fbdev) | 36 | struct omapfb_device *fbdev) |
diff --git a/drivers/video/omap/lcd_palmz71.c b/drivers/video/omap/lcd_palmz71.c index ea6170ddff35..d33d78b11723 100644 --- a/drivers/video/omap/lcd_palmz71.c +++ b/drivers/video/omap/lcd_palmz71.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | 26 | ||
27 | #include <asm/arch/omapfb.h> | 27 | #include <mach/omapfb.h> |
28 | 28 | ||
29 | static int palmz71_panel_init(struct lcd_panel *panel, | 29 | static int palmz71_panel_init(struct lcd_panel *panel, |
30 | struct omapfb_device *fbdev) | 30 | struct omapfb_device *fbdev) |
diff --git a/drivers/video/omap/lcd_sx1.c b/drivers/video/omap/lcd_sx1.c index c4f306a4e5c9..caa6a896cb8b 100644 --- a/drivers/video/omap/lcd_sx1.c +++ b/drivers/video/omap/lcd_sx1.c | |||
@@ -23,10 +23,10 @@ | |||
23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
25 | 25 | ||
26 | #include <asm/arch/gpio.h> | 26 | #include <mach/gpio.h> |
27 | #include <asm/arch/omapfb.h> | 27 | #include <mach/omapfb.h> |
28 | #include <asm/arch/mcbsp.h> | 28 | #include <mach/mcbsp.h> |
29 | #include <asm/arch/mux.h> | 29 | #include <mach/mux.h> |
30 | 30 | ||
31 | /* | 31 | /* |
32 | * OMAP310 GPIO registers | 32 | * OMAP310 GPIO registers |
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index fb19ed4992db..83514f066712 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c | |||
@@ -29,8 +29,8 @@ | |||
29 | #include <linux/vmalloc.h> | 29 | #include <linux/vmalloc.h> |
30 | #include <linux/clk.h> | 30 | #include <linux/clk.h> |
31 | 31 | ||
32 | #include <asm/arch/dma.h> | 32 | #include <mach/dma.h> |
33 | #include <asm/arch/omapfb.h> | 33 | #include <mach/omapfb.h> |
34 | 34 | ||
35 | #include <asm/mach-types.h> | 35 | #include <asm/mach-types.h> |
36 | 36 | ||
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index d9abc48a210b..51a138bd113c 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
@@ -28,8 +28,8 @@ | |||
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/arch/dma.h> | 31 | #include <mach/dma.h> |
32 | #include <asm/arch/omapfb.h> | 32 | #include <mach/omapfb.h> |
33 | 33 | ||
34 | #define MODULE_NAME "omapfb" | 34 | #define MODULE_NAME "omapfb" |
35 | 35 | ||
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index 789cfd23c36b..4a6f13d3facf 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
29 | 29 | ||
30 | #include <asm/arch/omapfb.h> | 30 | #include <mach/omapfb.h> |
31 | 31 | ||
32 | #include "dispc.h" | 32 | #include "dispc.h" |
33 | 33 | ||
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c index fafd0f26b90f..6359353c2c67 100644 --- a/drivers/video/omap/sossi.c +++ b/drivers/video/omap/sossi.c | |||
@@ -24,8 +24,8 @@ | |||
24 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | 26 | ||
27 | #include <asm/arch/dma.h> | 27 | #include <mach/dma.h> |
28 | #include <asm/arch/omapfb.h> | 28 | #include <mach/omapfb.h> |
29 | 29 | ||
30 | #include "lcdc.h" | 30 | #include "lcdc.h" |
31 | 31 | ||
diff --git a/drivers/video/pnx4008/dum.h b/drivers/video/pnx4008/dum.h index d80a614d89ed..1234d4375d92 100644 --- a/drivers/video/pnx4008/dum.h +++ b/drivers/video/pnx4008/dum.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #ifndef __PNX008_DUM_H__ | 12 | #ifndef __PNX008_DUM_H__ |
13 | #define __PNX008_DUM_H__ | 13 | #define __PNX008_DUM_H__ |
14 | 14 | ||
15 | #include <asm/arch/platform.h> | 15 | #include <mach/platform.h> |
16 | 16 | ||
17 | #define PNX4008_DUMCONF_VA_BASE IO_ADDRESS(PNX4008_DUMCONF_BASE) | 17 | #define PNX4008_DUMCONF_VA_BASE IO_ADDRESS(PNX4008_DUMCONF_BASE) |
18 | #define PNX4008_DUM_MAIN_VA_BASE IO_ADDRESS(PNX4008_DUM_MAINCFG_BASE) | 18 | #define PNX4008_DUM_MAIN_VA_BASE IO_ADDRESS(PNX4008_DUM_MAINCFG_BASE) |
diff --git a/drivers/video/pnx4008/sdum.c b/drivers/video/pnx4008/sdum.c index d23bf0d659b6..2aa09bce3944 100644 --- a/drivers/video/pnx4008/sdum.c +++ b/drivers/video/pnx4008/sdum.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <linux/dma-mapping.h> | 30 | #include <linux/dma-mapping.h> |
31 | #include <linux/clk.h> | 31 | #include <linux/clk.h> |
32 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
33 | #include <asm/arch/gpio.h> | 33 | #include <mach/gpio.h> |
34 | 34 | ||
35 | #include "sdum.h" | 35 | #include "sdum.h" |
36 | #include "fbcommon.h" | 36 | #include "fbcommon.h" |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 3169ea4831ef..e7aa7ae8fca8 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -45,14 +45,14 @@ | |||
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/arch/hardware.h> | 48 | #include <mach/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> |
52 | #include <asm/arch/pxa-regs.h> | 52 | #include <mach/pxa-regs.h> |
53 | #include <asm/arch/pxa2xx-gpio.h> | 53 | #include <mach/pxa2xx-gpio.h> |
54 | #include <asm/arch/bitfield.h> | 54 | #include <mach/bitfield.h> |
55 | #include <asm/arch/pxafb.h> | 55 | #include <mach/pxafb.h> |
56 | 56 | ||
57 | /* | 57 | /* |
58 | * Complain if VAR is out of range. | 58 | * Complain if VAR is out of range. |
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index f0598961c6b0..79cf0b1976aa 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <asm/div64.h> | 29 | #include <asm/div64.h> |
30 | 30 | ||
31 | #include <asm/mach/map.h> | 31 | #include <asm/mach/map.h> |
32 | #include <asm/arch/regs-lcd.h> | 32 | #include <mach/regs-lcd.h> |
33 | #include <asm/arch/regs-gpio.h> | 33 | #include <mach/regs-gpio.h> |
34 | #include <asm/arch/fb.h> | 34 | #include <mach/fb.h> |
35 | 35 | ||
36 | #ifdef CONFIG_PM | 36 | #ifdef CONFIG_PM |
37 | #include <linux/pm.h> | 37 | #include <linux/pm.h> |
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 8fbcce6d069d..c052bd4c0b06 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c | |||
@@ -177,11 +177,11 @@ | |||
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/arch/hardware.h> | 180 | #include <mach/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 <mach/assabet.h> |
184 | #include <asm/arch/shannon.h> | 184 | #include <mach/shannon.h> |
185 | 185 | ||
186 | /* | 186 | /* |
187 | * debugging? | 187 | * debugging? |