diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-04 15:24:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-04 15:24:57 +0200 |
| commit | 94de405d8f56aa66283d7497c707380762440601 (patch) | |
| tree | ef6618eb4604ff3cbc69af90d9ec6feb4db5e771 /arch/arm/mach-mxs | |
| parent | ddba7e606bc7a6b3715d6c123c0a9b708a6b8776 (diff) | |
| parent | d4edd480b2ab0754361b142e307796405310d34b (diff) | |
| download | barebox-94de405d8f56aa66283d7497c707380762440601.tar.gz barebox-94de405d8f56aa66283d7497c707380762440601.tar.xz | |
Merge branch 'for-next/imx-clk'
Diffstat (limited to 'arch/arm/mach-mxs')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/imx23-regs.h | 7 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/imx28-regs.h | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-mxs/include/mach/imx23-regs.h b/arch/arm/mach-mxs/include/mach/imx23-regs.h index ade3139596..7fb664b334 100644 --- a/arch/arm/mach-mxs/include/mach/imx23-regs.h +++ b/arch/arm/mach-mxs/include/mach/imx23-regs.h @@ -15,13 +15,6 @@ #ifndef __ASM_ARCH_MX23_REGS_H #define __ASM_ARCH_MX23_REGS_H -/* - * sanity check - */ -#ifndef _IMX_REGS_H -# error "Please do not include directly. Use imx-regs.h instead." -#endif - #define IMX_MEMORY_BASE 0x40000000 #define MXS_APBH_BASE 0x80004000 #define MXS_BCH_BASE 0x8000a000 diff --git a/arch/arm/mach-mxs/include/mach/imx28-regs.h b/arch/arm/mach-mxs/include/mach/imx28-regs.h index 16bf5f7a60..fa8edd7d4b 100644 --- a/arch/arm/mach-mxs/include/mach/imx28-regs.h +++ b/arch/arm/mach-mxs/include/mach/imx28-regs.h @@ -13,13 +13,6 @@ #ifndef __ASM_ARCH_MX28_REGS_H #define __ASM_ARCH_MX28_REGS_H -/* - * sanity check - */ -#ifndef _IMX_REGS_H -# error "Please do not include directly. Use imx-regs.h instead." -#endif - #define IMX_SRAM_BASE 0x00000000 #define IMX_MEMORY_BASE 0x40000000 |