git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-mx2
/
devices.c
diff --git
a/arch/arm/mach-mx2/devices.c
b/arch/arm/mach-mx2/devices.c
index f81aa8a8fbb4e2917aafcb3529a55c620c33d7f3..a0f1b36743274834dac351596107d742813177c6 100644
(file)
--- a/
arch/arm/mach-mx2/devices.c
+++ b/
arch/arm/mach-mx2/devices.c
@@
-229,7
+229,6
@@
struct platform_device mxc_nand_device = {
.resource = mxc_nand_resources,
};
-#ifdef CONFIG_FB_IMX
/*
* lcdc:
* - i.MX1: the basic controller
@@
-259,7
+258,6
@@
struct platform_device mxc_fb_device = {
.coherent_dma_mask = 0xFFFFFFFF,
},
};
-#endif
#ifdef CONFIG_MACH_MX27
static struct resource mxc_fec_resources[] = {