diff options
Diffstat (limited to 'drivers/video/omap')
-rw-r--r-- | drivers/video/omap/blizzard.c | 6 | ||||
-rw-r--r-- | drivers/video/omap/dispc.c | 6 | ||||
-rw-r--r-- | drivers/video/omap/hwa742.c | 6 | ||||
-rw-r--r-- | drivers/video/omap/lcd_h3.c | 4 | ||||
-rw-r--r-- | drivers/video/omap/lcd_h4.c | 2 | ||||
-rw-r--r-- | drivers/video/omap/lcd_inn1510.c | 4 | ||||
-rw-r--r-- | drivers/video/omap/lcd_inn1610.c | 4 | ||||
-rw-r--r-- | drivers/video/omap/lcd_osk.c | 6 | ||||
-rw-r--r-- | drivers/video/omap/lcd_palmte.c | 4 | ||||
-rw-r--r-- | drivers/video/omap/lcd_palmtt.c | 4 | ||||
-rw-r--r-- | drivers/video/omap/lcd_palmz71.c | 2 | ||||
-rw-r--r-- | drivers/video/omap/lcd_sx1.c | 8 | ||||
-rw-r--r-- | drivers/video/omap/lcdc.c | 4 | ||||
-rw-r--r-- | drivers/video/omap/omapfb_main.c | 4 | ||||
-rw-r--r-- | drivers/video/omap/rfbi.c | 2 | ||||
-rw-r--r-- | drivers/video/omap/sossi.c | 4 |
16 files changed, 35 insertions, 35 deletions
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 | ||