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 'pxa-devel' into pxa
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
Kconfig
diff --git
a/arch/arm/mach-pxa/Kconfig
b/arch/arm/mach-pxa/Kconfig
index
fdea1e7
..
3e28521
100644
(file)
--- a/
arch/arm/mach-pxa/Kconfig
+++ b/
arch/arm/mach-pxa/Kconfig
@@
-184,7
+184,7
@@
config MACH_COLIBRI
select PXA27x
config MACH_ZYLONITE
- bool "PXA3xx Development Platform"
+ bool "PXA3xx Development Platform
(aka Zylonite)
"
select PXA3xx
select HAVE_PWM