git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-w90x900
/
nuc950.c
diff --git
a/arch/arm/mach-w90x900/nuc950.c
b/arch/arm/mach-w90x900/nuc950.c
index
1495081
..
4d1f1ab
100644
(file)
--- a/
arch/arm/mach-w90x900/nuc950.c
+++ b/
arch/arm/mach-w90x900/nuc950.c
@@
-18,6
+18,7
@@
#include <linux/platform_device.h>
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <linux/platform_device.h>
#include <asm/mach/map.h>
#include <mach/hardware.h>
+
#include "cpu.h"
/* define specific CPU platform device */
#include "cpu.h"
/* define specific CPU platform device */
@@
-25,6
+26,9
@@
static struct platform_device *nuc950_dev[] __initdata = {
&nuc900_device_kpi,
&nuc900_device_fmi,
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 */
};
/* define specific CPU platform io map */