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 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
Kconfig
diff --git
a/arch/arm/mach-mmp/Kconfig
b/arch/arm/mach-mmp/Kconfig
index
56ef5f6
..
323d4c9
100644
(file)
--- a/
arch/arm/mach-mmp/Kconfig
+++ b/
arch/arm/mach-mmp/Kconfig
@@
-77,7
+77,7
@@
config MACH_TETON_BGA
Say 'Y' here if you want to support the Marvell PXA168-based
Teton BGA Development Board.
-config MACH_
SHEEVA
D
+config MACH_
GPLUG
D
bool "Marvell's PXA168 GuruPlug Display (gplugD) Board"
select CPU_PXA168
help