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 branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx25
/
Kconfig
diff --git
a/arch/arm/mach-mx25/Kconfig
b/arch/arm/mach-mx25/Kconfig
index
326bb64
..
aa57e35
100644
(file)
--- a/
arch/arm/mach-mx25/Kconfig
+++ b/
arch/arm/mach-mx25/Kconfig
@@
-12,6
+12,8
@@
config MACH_EUKREA_CPUIMX25
select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MXC_NAND
+ select IMX_HAVE_PLATFORM_FLEXCAN
+ select IMX_HAVE_PLATFORM_ESDHC
select MXC_ULPI if USB_ULPI
choice