From 3636a145321573f2f735e3ae69f87e0fb166abec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Thu, 11 Feb 2010 16:31:49 +0100 Subject: arm/mx2: use per-SOC nand device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous commit introduced one nand device per SoC. Use this directly instead of the compatibility macro that will break for multi-SoC kernels. And while at it remove the compatibility macro now that all in-tree users are fixed. Signed-off-by: Uwe Kleine-König --- arch/arm/mach-mx2/devices.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/arm/mach-mx2/devices.h') diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h index 02e5dd203095..f15df2aaae4d 100644 --- a/arch/arm/mach-mx2/devices.h +++ b/arch/arm/mach-mx2/devices.h @@ -15,13 +15,9 @@ extern struct platform_device mxc_uart_device5; extern struct platform_device mxc_w1_master_device; #ifdef CONFIG_MACH_MX21 extern struct platform_device imx21_nand_device; -#define mxc_nand_device imx21_nand_device #endif #ifdef CONFIG_MACH_MX27 extern struct platform_device imx27_nand_device; -#ifndef CONFIG_MACH_MX21 -#define mxc_nand_device imx27_nand_device -#endif #endif extern struct platform_device mxc_fb_device; extern struct platform_device mxc_fec_device; -- cgit v1.2.1