projects
/
linux-2.6-block.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/davem/net-next
[linux-2.6-block.git]
/
arch
/
arm
/
mach-mxs
/
Kconfig
diff --git
a/arch/arm/mach-mxs/Kconfig
b/arch/arm/mach-mxs/Kconfig
index 616fe0210da1e16b173ca4f79db30c8ce4c70c37..8cde9e05b5d65c17194cb8acee8c19a52d5aa025 100644
(file)
--- a/
arch/arm/mach-mxs/Kconfig
+++ b/
arch/arm/mach-mxs/Kconfig
@@
-10,7
+10,6
@@
config SOC_IMX28
select ARM_AMBA
select ARM_CPU_SUSPEND if PM
select CPU_ARM926T
- select HAVE_CAN_FLEXCAN if CAN
select PINCTRL_IMX28
config ARCH_MXS