diff options
| -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 @@ */ #include <mach/mx23.h> #include <mach/devices-common.h> -#include <mach/mxsfb.h> +#include <linux/mxsfb.h> #include <linux/amba/bus.h> 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 @@ */ #include <mach/mx28.h> #include <mach/devices-common.h> -#include <mach/mxsfb.h> +#include <linux/mxsfb.h> #include <linux/amba/bus.h> 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 @@ #include <mach/mx23.h> #include <mach/mx28.h> #include <mach/devices-common.h> -#include <mach/mxsfb.h> +#include <linux/mxsfb.h> #ifdef CONFIG_SOC_IMX23 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 @@ #include <linux/dma-mapping.h> #include <linux/io.h> #include <linux/pinctrl/consumer.h> -#include <mach/mxsfb.h> +#include <linux/mxsfb.h> #define REG_SET 4 #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 @@ * MA 02110-1301, USA. */ -#ifndef __MACH_FB_H -#define __MACH_FB_H +#ifndef __LINUX_MXSFB_H +#define __LINUX_MXSFB_H #include <linux/fb.h> @@ -46,4 +46,4 @@ struct mxsfb_platform_data { */ }; -#endif /* __MACH_FB_H */ +#endif /* __LINUX_MXSFB_H */ |