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 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-u300
/
Kconfig
diff --git
a/arch/arm/mach-u300/Kconfig
b/arch/arm/mach-u300/Kconfig
index
801b21e
..
449fd6a
100644
(file)
--- a/
arch/arm/mach-u300/Kconfig
+++ b/
arch/arm/mach-u300/Kconfig
@@
-6,6
+6,8
@@
comment "ST-Ericsson Mobile Platform Products"
config MACH_U300
bool "U300"
config MACH_U300
bool "U300"
+ select PINCTRL
+ select PINMUX_U300
comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"
comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"
@@
-64,7
+66,7
@@
config MACH_U300_DUAL_RAM
bool "Dual RAM"
help
Select this if you want support for Dual RAM phones.
bool "Dual RAM"
help
Select this if you want support for Dual RAM phones.
- This is two RAM memor
y
s on different EMIFs.
+ This is two RAM memor
ie
s on different EMIFs.
endchoice
config U300_DEBUG
endchoice
config U300_DEBUG