diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:32 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:32 +0200 |
| commit | 45b87922a60e200aba668cc76f78ff2ff01ea382 (patch) | |
| tree | f95c9cb858b5c811d8288e129f3eb4aa610256ba /arch/arm/mach-imx/include/mach/generic.h | |
| parent | 8f2c6a3d2b513e64f680e7e9a70d1e068b71110a (diff) | |
| parent | 4271263e0d81cbb1e51a9a56e206844355ae7b7d (diff) | |
| download | barebox-45b87922a60e200aba668cc76f78ff2ff01ea382.tar.gz barebox-45b87922a60e200aba668cc76f78ff2ff01ea382.tar.xz | |
Merge branch 'for-next/misc-arm'
Diffstat (limited to 'arch/arm/mach-imx/include/mach/generic.h')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/generic.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/include/mach/generic.h b/arch/arm/mach-imx/include/mach/generic.h index 6bce7876bd..189b32f2c3 100644 --- a/arch/arm/mach-imx/include/mach/generic.h +++ b/arch/arm/mach-imx/include/mach/generic.h @@ -1,3 +1,5 @@ +#ifndef __MACH_GENERIC_H +#define __MACH_GENERIC_H u64 imx_uid(void); @@ -68,3 +70,5 @@ void imx6_boot_save_loc(void __iomem *src_base); #define cpu_is_mx23() (0) #define cpu_is_mx28() (0) + +#endif /* __MACH_GENERIC_H */ |