diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-24 08:24:29 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-24 08:24:29 +0100 |
| commit | 2a85927c79634e89b9cd683dd2bae65966d9b216 (patch) | |
| tree | 5e922b0f26e4099b6bcad65d2d5ea42e166ff068 /arch/arm/plat-mxc/include/mach/imxfb.h | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
| parent | 124bf94a9f9b52341562628cd56b252e7d820ee8 (diff) | |
| download | op-kernel-dev-2a85927c79634e89b9cd683dd2bae65966d9b216.zip op-kernel-dev-2a85927c79634e89b9cd683dd2bae65966d9b216.tar.gz | |
Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/imxfb.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/imxfb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/imxfb.h b/arch/arm/plat-mxc/include/mach/imxfb.h index 5263506..9de8f06 100644 --- a/arch/arm/plat-mxc/include/mach/imxfb.h +++ b/arch/arm/plat-mxc/include/mach/imxfb.h @@ -1,6 +1,8 @@ /* * This structure describes the machine which we are running on. */ +#ifndef __MACH_IMXFB_H__ +#define __MACH_IMXFB_H__ #include <linux/fb.h> @@ -79,3 +81,4 @@ struct imx_fb_platform_data { }; void set_imx_fb_info(struct imx_fb_platform_data *); +#endif /* ifndef __MACH_IMXFB_H__ */ |
