diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-06-25 07:22:09 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-07-03 01:22:37 -0400 |
commit | ce4409b5821f170c018b94bacb36df1ffadb751f (patch) | |
tree | 7262c6d6a487081e8bcbaab03db1d723202592f2 | |
parent | dd8d20a3f32a7ba37526f5b4dfd4d35a93e5342f (diff) |
video: mxsfb: move mxsfb.h into include/linux
Move mxsfb.h into include/linux, so that mxsfb driver does not have to
include <mach/*> header.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/mach-mxs/devices-mx23.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-mxs/devices-mx28.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-mxs/devices/platform-mxsfb.c | 2 | ||||
-rw-r--r-- | drivers/video/mxsfb.c | 2 | ||||
-rw-r--r-- | include/linux/mxsfb.h (renamed from arch/arm/mach-mxs/include/mach/mxsfb.h) | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-mxs/devices-mx23.h b/arch/arm/mach-mxs/devices-mx23.h index 9acdd6387047..9ee5cede3d42 100644 --- a/arch/arm/mach-mxs/devices-mx23.h +++ b/arch/arm/mach-mxs/devices-mx23.h | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | #include <mach/mx23.h> | 11 | #include <mach/mx23.h> |
12 | #include <mach/devices-common.h> | 12 | #include <mach/devices-common.h> |
13 | #include <mach/mxsfb.h> | 13 | #include <linux/mxsfb.h> |
14 | #include <linux/amba/bus.h> | 14 | #include <linux/amba/bus.h> |
15 | 15 | ||
16 | static inline int mx23_add_duart(void) | 16 | static inline int mx23_add_duart(void) |
diff --git a/arch/arm/mach-mxs/devices-mx28.h b/arch/arm/mach-mxs/devices-mx28.h index 84b2960df117..fcab431060f4 100644 --- a/arch/arm/mach-mxs/devices-mx28.h +++ b/arch/arm/mach-mxs/devices-mx28.h | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | #include <mach/mx28.h> | 11 | #include <mach/mx28.h> |
12 | #include <mach/devices-common.h> | 12 | #include <mach/devices-common.h> |
13 | #include <mach/mxsfb.h> | 13 | #include <linux/mxsfb.h> |
14 | #include <linux/amba/bus.h> | 14 | #include <linux/amba/bus.h> |
15 | 15 | ||
16 | static inline int mx28_add_duart(void) | 16 | static inline int mx28_add_duart(void) |
diff --git a/arch/arm/mach-mxs/devices/platform-mxsfb.c b/arch/arm/mach-mxs/devices/platform-mxsfb.c index 5a75b7180f74..76b53f73418e 100644 --- a/arch/arm/mach-mxs/devices/platform-mxsfb.c +++ b/arch/arm/mach-mxs/devices/platform-mxsfb.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <mach/mx23.h> | 10 | #include <mach/mx23.h> |
11 | #include <mach/mx28.h> | 11 | #include <mach/mx28.h> |
12 | #include <mach/devices-common.h> | 12 | #include <mach/devices-common.h> |
13 | #include <mach/mxsfb.h> | 13 | #include <linux/mxsfb.h> |
14 | 14 | ||
15 | #ifdef CONFIG_SOC_IMX23 | 15 | #ifdef CONFIG_SOC_IMX23 |
16 | struct platform_device *__init mx23_add_mxsfb( | 16 | struct platform_device *__init mx23_add_mxsfb( |
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index abbe691047bd..08dad8d8abba 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include <linux/dma-mapping.h> | 46 | #include <linux/dma-mapping.h> |
47 | #include <linux/io.h> | 47 | #include <linux/io.h> |
48 | #include <linux/pinctrl/consumer.h> | 48 | #include <linux/pinctrl/consumer.h> |
49 | #include <mach/mxsfb.h> | 49 | #include <linux/mxsfb.h> |
50 | 50 | ||
51 | #define REG_SET 4 | 51 | #define REG_SET 4 |
52 | #define REG_CLR 8 | 52 | #define REG_CLR 8 |
diff --git a/arch/arm/mach-mxs/include/mach/mxsfb.h b/include/linux/mxsfb.h index e4d79791515e..f14943d55315 100644 --- a/arch/arm/mach-mxs/include/mach/mxsfb.h +++ b/include/linux/mxsfb.h | |||
@@ -14,8 +14,8 @@ | |||
14 | * MA 02110-1301, USA. | 14 | * MA 02110-1301, USA. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #ifndef __MACH_FB_H | 17 | #ifndef __LINUX_MXSFB_H |
18 | #define __MACH_FB_H | 18 | #define __LINUX_MXSFB_H |
19 | 19 | ||
20 | #include <linux/fb.h> | 20 | #include <linux/fb.h> |
21 | 21 | ||
@@ -46,4 +46,4 @@ struct mxsfb_platform_data { | |||
46 | */ | 46 | */ |
47 | }; | 47 | }; |
48 | 48 | ||
49 | #endif /* __MACH_FB_H */ | 49 | #endif /* __LINUX_MXSFB_H */ |