diff options
-rw-r--r-- | arch/arm/mach-msm/board-qsd8x50.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/board-trout-mmc.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/board-trout-panel.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/devices-msm7x00.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/devices-msm7x30.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/devices-qsd8x50.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/board.h | 2 | ||||
-rw-r--r-- | drivers/mmc/host/msm_sdcc.c | 2 | ||||
-rw-r--r-- | drivers/video/msm/mddi.c | 2 | ||||
-rw-r--r-- | drivers/video/msm/mddi_client_dummy.c | 2 | ||||
-rw-r--r-- | drivers/video/msm/mddi_client_nt35399.c | 2 | ||||
-rw-r--r-- | drivers/video/msm/mddi_client_toshiba.c | 2 | ||||
-rw-r--r-- | drivers/video/msm/mdp.c | 2 | ||||
-rw-r--r-- | drivers/video/msm/mdp_hw.h | 2 | ||||
-rw-r--r-- | drivers/video/msm/mdp_ppp.c | 2 | ||||
-rw-r--r-- | drivers/video/msm/msm_fb.c | 2 | ||||
-rw-r--r-- | include/linux/platform_data/mmc-msm_sdcc.h (renamed from arch/arm/mach-msm/include/mach/mmc.h) | 0 | ||||
-rw-r--r-- | include/linux/platform_data/video-msm_fb.h (renamed from arch/arm/mach-msm/include/mach/msm_fb.h) | 0 |
18 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c index c8fe0edb9761..b21bb4cfc642 100644 --- a/arch/arm/mach-msm/board-qsd8x50.c +++ b/arch/arm/mach-msm/board-qsd8x50.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <mach/irqs.h> | 32 | #include <mach/irqs.h> |
33 | #include <mach/sirc.h> | 33 | #include <mach/sirc.h> |
34 | #include <mach/vreg.h> | 34 | #include <mach/vreg.h> |
35 | #include <mach/mmc.h> | 35 | #include <linux/platform_data/mmc-msm_sdcc.h> |
36 | 36 | ||
37 | #include "devices.h" | 37 | #include "devices.h" |
38 | 38 | ||
diff --git a/arch/arm/mach-msm/board-trout-mmc.c b/arch/arm/mach-msm/board-trout-mmc.c index 8650342b7493..3723e55819d6 100644 --- a/arch/arm/mach-msm/board-trout-mmc.c +++ b/arch/arm/mach-msm/board-trout-mmc.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #include <mach/vreg.h> | 16 | #include <mach/vreg.h> |
17 | 17 | ||
18 | #include <mach/mmc.h> | 18 | #include <linux/platform_data/mmc-msm_sdcc.h> |
19 | 19 | ||
20 | #include "devices.h" | 20 | #include "devices.h" |
21 | 21 | ||
diff --git a/arch/arm/mach-msm/board-trout-panel.c b/arch/arm/mach-msm/board-trout-panel.c index 89bf6b426699..f9a5db6d2ced 100644 --- a/arch/arm/mach-msm/board-trout-panel.c +++ b/arch/arm/mach-msm/board-trout-panel.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <asm/mach-types.h> | 14 | #include <asm/mach-types.h> |
15 | #include <asm/system_info.h> | 15 | #include <asm/system_info.h> |
16 | 16 | ||
17 | #include <mach/msm_fb.h> | 17 | #include <linux/platform_data/video-msm_fb.h> |
18 | #include <mach/vreg.h> | 18 | #include <mach/vreg.h> |
19 | 19 | ||
20 | #include "board-trout.h" | 20 | #include "board-trout.h" |
diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c index 993780f490ad..f66ee6ea8720 100644 --- a/arch/arm/mach-msm/devices-msm7x00.c +++ b/arch/arm/mach-msm/devices-msm7x00.c | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | #include "clock.h" | 28 | #include "clock.h" |
29 | #include "clock-pcom.h" | 29 | #include "clock-pcom.h" |
30 | #include <mach/mmc.h> | 30 | #include <linux/platform_data/mmc-msm_sdcc.h> |
31 | 31 | ||
32 | static struct resource resources_uart1[] = { | 32 | static struct resource resources_uart1[] = { |
33 | { | 33 | { |
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c index 09b4f1403824..e90ab5938c5f 100644 --- a/arch/arm/mach-msm/devices-msm7x30.c +++ b/arch/arm/mach-msm/devices-msm7x30.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include "clock-pcom.h" | 31 | #include "clock-pcom.h" |
32 | #include "clock-7x30.h" | 32 | #include "clock-7x30.h" |
33 | 33 | ||
34 | #include <mach/mmc.h> | 34 | #include <linux/platform_data/mmc-msm_sdcc.h> |
35 | 35 | ||
36 | static struct resource resources_uart2[] = { | 36 | static struct resource resources_uart2[] = { |
37 | { | 37 | { |
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c index 131633b12a34..4db61d5fe317 100644 --- a/arch/arm/mach-msm/devices-qsd8x50.c +++ b/arch/arm/mach-msm/devices-qsd8x50.c | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | #include <asm/mach/flash.h> | 28 | #include <asm/mach/flash.h> |
29 | 29 | ||
30 | #include <mach/mmc.h> | 30 | #include <linux/platform_data/mmc-msm_sdcc.h> |
31 | #include "clock-pcom.h" | 31 | #include "clock-pcom.h" |
32 | 32 | ||
33 | static struct resource resources_uart3[] = { | 33 | static struct resource resources_uart3[] = { |
diff --git a/arch/arm/mach-msm/include/mach/board.h b/arch/arm/mach-msm/include/mach/board.h index 435f8edfafd1..70e0f98ecdb9 100644 --- a/arch/arm/mach-msm/include/mach/board.h +++ b/arch/arm/mach-msm/include/mach/board.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #define __ASM_ARCH_MSM_BOARD_H | 18 | #define __ASM_ARCH_MSM_BOARD_H |
19 | 19 | ||
20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
21 | #include <mach/mmc.h> | 21 | #include <linux/platform_data/mmc-msm_sdcc.h> |
22 | 22 | ||
23 | /* platform device data structures */ | 23 | /* platform device data structures */ |
24 | 24 | ||
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c index 1d14cda95e56..7c0af0e80047 100644 --- a/drivers/mmc/host/msm_sdcc.c +++ b/drivers/mmc/host/msm_sdcc.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <asm/div64.h> | 42 | #include <asm/div64.h> |
43 | #include <asm/sizes.h> | 43 | #include <asm/sizes.h> |
44 | 44 | ||
45 | #include <mach/mmc.h> | 45 | #include <linux/platform_data/mmc-msm_sdcc.h> |
46 | #include <mach/msm_iomap.h> | 46 | #include <mach/msm_iomap.h> |
47 | #include <mach/dma.h> | 47 | #include <mach/dma.h> |
48 | #include <mach/clk.h> | 48 | #include <mach/clk.h> |
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c index b061d709bc44..bf73f0480061 100644 --- a/drivers/video/msm/mddi.c +++ b/drivers/video/msm/mddi.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <mach/msm_iomap.h> | 29 | #include <mach/msm_iomap.h> |
30 | #include <mach/irqs.h> | 30 | #include <mach/irqs.h> |
31 | #include <mach/board.h> | 31 | #include <mach/board.h> |
32 | #include <mach/msm_fb.h> | 32 | #include <linux/platform_data/video-msm_fb.h> |
33 | #include "mddi_hw.h" | 33 | #include "mddi_hw.h" |
34 | 34 | ||
35 | #define FLAG_DISABLE_HIBERNATION 0x0001 | 35 | #define FLAG_DISABLE_HIBERNATION 0x0001 |
diff --git a/drivers/video/msm/mddi_client_dummy.c b/drivers/video/msm/mddi_client_dummy.c index d2a091cebe2c..f1b0dfcc9717 100644 --- a/drivers/video/msm/mddi_client_dummy.c +++ b/drivers/video/msm/mddi_client_dummy.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | 22 | ||
23 | #include <mach/msm_fb.h> | 23 | #include <linux/platform_data/video-msm_fb.h> |
24 | 24 | ||
25 | struct panel_info { | 25 | struct panel_info { |
26 | struct platform_device pdev; | 26 | struct platform_device pdev; |
diff --git a/drivers/video/msm/mddi_client_nt35399.c b/drivers/video/msm/mddi_client_nt35399.c index 7fcd67e132bf..d7a5bf84fb2a 100644 --- a/drivers/video/msm/mddi_client_nt35399.c +++ b/drivers/video/msm/mddi_client_nt35399.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
23 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | #include <mach/msm_fb.h> | 25 | #include <linux/platform_data/video-msm_fb.h> |
26 | 26 | ||
27 | static DECLARE_WAIT_QUEUE_HEAD(nt35399_vsync_wait); | 27 | static DECLARE_WAIT_QUEUE_HEAD(nt35399_vsync_wait); |
28 | 28 | ||
diff --git a/drivers/video/msm/mddi_client_toshiba.c b/drivers/video/msm/mddi_client_toshiba.c index 053eb6877330..061d7dfebbf3 100644 --- a/drivers/video/msm/mddi_client_toshiba.c +++ b/drivers/video/msm/mddi_client_toshiba.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
23 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | #include <mach/msm_fb.h> | 25 | #include <linux/platform_data/video-msm_fb.h> |
26 | 26 | ||
27 | 27 | ||
28 | #define LCD_CONTROL_BLOCK_BASE 0x110000 | 28 | #define LCD_CONTROL_BLOCK_BASE 0x110000 |
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c index cb2ddf164c98..d1f881e8030e 100644 --- a/drivers/video/msm/mdp.c +++ b/drivers/video/msm/mdp.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | 27 | ||
28 | #include <mach/msm_iomap.h> | 28 | #include <mach/msm_iomap.h> |
29 | #include <mach/msm_fb.h> | 29 | #include <linux/platform_data/video-msm_fb.h> |
30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
31 | #include <linux/export.h> | 31 | #include <linux/export.h> |
32 | 32 | ||
diff --git a/drivers/video/msm/mdp_hw.h b/drivers/video/msm/mdp_hw.h index d80477415caa..a0bacf581b32 100644 --- a/drivers/video/msm/mdp_hw.h +++ b/drivers/video/msm/mdp_hw.h | |||
@@ -16,7 +16,7 @@ | |||
16 | #define _MDP_HW_H_ | 16 | #define _MDP_HW_H_ |
17 | 17 | ||
18 | #include <mach/msm_iomap.h> | 18 | #include <mach/msm_iomap.h> |
19 | #include <mach/msm_fb.h> | 19 | #include <linux/platform_data/video-msm_fb.h> |
20 | 20 | ||
21 | struct mdp_info { | 21 | struct mdp_info { |
22 | struct mdp_device mdp_dev; | 22 | struct mdp_device mdp_dev; |
diff --git a/drivers/video/msm/mdp_ppp.c b/drivers/video/msm/mdp_ppp.c index 2b6564e8bfea..be6079cdfbb6 100644 --- a/drivers/video/msm/mdp_ppp.c +++ b/drivers/video/msm/mdp_ppp.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/file.h> | 16 | #include <linux/file.h> |
17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
18 | #include <linux/msm_mdp.h> | 18 | #include <linux/msm_mdp.h> |
19 | #include <mach/msm_fb.h> | 19 | #include <linux/platform_data/video-msm_fb.h> |
20 | 20 | ||
21 | #include "mdp_hw.h" | 21 | #include "mdp_hw.h" |
22 | #include "mdp_scale_tables.h" | 22 | #include "mdp_scale_tables.h" |
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c index c6e3b4fcdd68..ec08a9ec377d 100644 --- a/drivers/video/msm/msm_fb.c +++ b/drivers/video/msm/msm_fb.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/msm_mdp.h> | 25 | #include <linux/msm_mdp.h> |
26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
27 | #include <linux/uaccess.h> | 27 | #include <linux/uaccess.h> |
28 | #include <mach/msm_fb.h> | 28 | #include <linux/platform_data/video-msm_fb.h> |
29 | #include <mach/board.h> | 29 | #include <mach/board.h> |
30 | #include <linux/workqueue.h> | 30 | #include <linux/workqueue.h> |
31 | #include <linux/clk.h> | 31 | #include <linux/clk.h> |
diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/include/linux/platform_data/mmc-msm_sdcc.h index ffcd9e3a6a7e..ffcd9e3a6a7e 100644 --- a/arch/arm/mach-msm/include/mach/mmc.h +++ b/include/linux/platform_data/mmc-msm_sdcc.h | |||
diff --git a/arch/arm/mach-msm/include/mach/msm_fb.h b/include/linux/platform_data/video-msm_fb.h index 1f4fc81b3d8f..1f4fc81b3d8f 100644 --- a/arch/arm/mach-msm/include/mach/msm_fb.h +++ b/include/linux/platform_data/video-msm_fb.h | |||