git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
arm
/
mach-ixp2000
/
Kconfig
diff --git
a/arch/arm/mach-ixp2000/Kconfig
b/arch/arm/mach-ixp2000/Kconfig
index
ecb58d8
..
86f53f8
100644
(file)
--- a/
arch/arm/mach-ixp2000/Kconfig
+++ b/
arch/arm/mach-ixp2000/Kconfig
@@
-43,12
+43,17
@@
config ARCH_IXDP2401
this platform, see <file:Documentation/arm/IXP2000>.
config ARCH_IXDP2801
this platform, see <file:Documentation/arm/IXP2000>.
config ARCH_IXDP2801
- bool "Support Intel IXDP2801"
+ bool "Support Intel IXDP2801
and IXDP28x5
"
help
Say 'Y' here if you want your kernel to support the Intel
help
Say 'Y' here if you want your kernel to support the Intel
- IXDP2801
reference platform
. For more information on
+ IXDP2801
/2805/2855 reference platforms
. For more information on
this platform, see <file:Documentation/arm/IXP2000>.
this platform, see <file:Documentation/arm/IXP2000>.
+config MACH_IXDP28X5
+ bool
+ depends on ARCH_IXDP2801
+ default y
+
config ARCH_IXDP2X01
bool
depends on ARCH_IXDP2401 || ARCH_IXDP2801
config ARCH_IXDP2X01
bool
depends on ARCH_IXDP2401 || ARCH_IXDP2801