diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-24 09:14:41 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 05:17:35 -0400 |
commit | 1ef21f6343ff08309955d1ad56ad0f5504a4dd94 (patch) | |
tree | f02e7c6c7bd8878ed5a40a40c368fa57117851ca /drivers/video | |
parent | 82906b13a6f4f42edec92f0a3e480e1bdd9b3f91 (diff) |
ARM: msm: move platform_data definitions
Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.
This moves such data out of the msm include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Cc: Chris Ball <cjb@laptop.org>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: linux-arm-msm@vger.kernel.org
Diffstat (limited to 'drivers/video')
-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 |
8 files changed, 8 insertions, 8 deletions
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> |