summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-w90x900/nuc950.c
diff options
context:
space:
mode:
authorwanzongshun <mcuos.com@gmail.com>2010-07-18 16:15:11 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-22 10:20:16 +0200
commit6a446b906d58420f9282d74d42e28ff7e3b50b5c (patch)
treefd9209b499bdc476ef4e3c422c2ca6a4eea211de /arch/arm/mach-w90x900/nuc950.c
parentMerge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/... (diff)
downloadlinux-6a446b906d58420f9282d74d42e28ff7e3b50b5c.tar.xz
linux-6a446b906d58420f9282d74d42e28ff7e3b50b5c.zip
ARM: 6231/1: re-organize the nuc900 lcd arch platform data setting
The patch re-organizes the nuc900 lcd arch platform data, remove the lcd platform data setting from nuc950.c to dev.c It can maximize the share codes between nuc900 series MCUs. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-w90x900/nuc950.c')
-rw-r--r--arch/arm/mach-w90x900/nuc950.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-w90x900/nuc950.c b/arch/arm/mach-w90x900/nuc950.c
index 4d1f1ab044c4..5704f74a50ee 100644
--- a/arch/arm/mach-w90x900/nuc950.c
+++ b/arch/arm/mach-w90x900/nuc950.c
@@ -26,9 +26,7 @@
static struct platform_device *nuc950_dev[] __initdata = {
&nuc900_device_kpi,
&nuc900_device_fmi,
-#ifdef CONFIG_FB_NUC900
&nuc900_device_lcd,
-#endif
};
/* define specific CPU platform io map */