diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 16:12:32 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 16:12:32 +0200 |
| commit | c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015 (patch) | |
| tree | a80672ee82fcc3d9c8d486e53731eb19cd968eb0 /arch/arm/mach-imx/devices/platform-mxc_nand.c | |
| parent | daa67b4b70568a07fef3cffacb2055891bf42ddb (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
Merge branch 'linus' into timers/core
Make sure the upstream fixes are applied before adding further
modifications.
Diffstat (limited to 'arch/arm/mach-imx/devices/platform-mxc_nand.c')
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-mxc_nand.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/devices/platform-mxc_nand.c b/arch/arm/mach-imx/devices/platform-mxc_nand.c index fa618a34f462..676df4920c7b 100644 --- a/arch/arm/mach-imx/devices/platform-mxc_nand.c +++ b/arch/arm/mach-imx/devices/platform-mxc_nand.c @@ -34,11 +34,6 @@ const struct imx_mxc_nand_data imx21_mxc_nand_data __initconst = imx_mxc_nand_data_entry_single(MX21, "imx21-nand", SZ_4K); #endif /* ifdef CONFIG_SOC_IMX21 */ -#ifdef CONFIG_SOC_IMX25 -const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst = - imx_mxc_nand_data_entry_single(MX25, "imx25-nand", SZ_8K); -#endif /* ifdef CONFIG_SOC_IMX25 */ - #ifdef CONFIG_SOC_IMX27 const struct imx_mxc_nand_data imx27_mxc_nand_data __initconst = imx_mxc_nand_data_entry_single(MX27, "imx27-nand", SZ_4K); |