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 tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
Kconfig
diff --git
a/arch/arm/mach-imx/Kconfig
b/arch/arm/mach-imx/Kconfig
index
3a2042f
..
32197c1
100644
(file)
--- a/
arch/arm/mach-imx/Kconfig
+++ b/
arch/arm/mach-imx/Kconfig
@@
-758,7
+758,7
@@
config SOC_IMX6Q
select HAVE_IMX_MMDC
select HAVE_IMX_SRC
select HAVE_SMP
- select MFD_
ANATOP
+ select MFD_
SYSCON
select PINCTRL
select PINCTRL_IMX6Q