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 'master' into for-next
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
devices
/
Kconfig
diff --git
a/arch/arm/plat-mxc/devices/Kconfig
b/arch/arm/plat-mxc/devices/Kconfig
index
2537166
..
b9ab1d5
100644
(file)
--- a/
arch/arm/plat-mxc/devices/Kconfig
+++ b/
arch/arm/plat-mxc/devices/Kconfig
@@
-1,6
+1,6
@@
config IMX_HAVE_PLATFORM_FEC
bool
- default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51
+ default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51
|| SOC_IMX53
config IMX_HAVE_PLATFORM_FLEXCAN
select HAVE_CAN_FLEXCAN if CAN