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 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-sti
/
Kconfig
diff --git
a/arch/arm/mach-sti/Kconfig
b/arch/arm/mach-sti/Kconfig
index
1831e96
..
878e9ec
100644
(file)
--- a/
arch/arm/mach-sti/Kconfig
+++ b/
arch/arm/mach-sti/Kconfig
@@
-1,5
+1,5
@@
menuconfig ARCH_STI
- bool "STMicroelectronics Consumer Electronics SOCs
with Device Trees
" if ARCH_MULTI_V7
+ bool "STMicroelectronics Consumer Electronics SOCs" if ARCH_MULTI_V7
select ARM_GIC
select ARM_GLOBAL_TIMER
select PINCTRL