summaryrefslogtreecommitdiff
path: root/arch/arm/mach-iop32x/Kconfig
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-04-24 19:26:50 +0400
committerSteve French <sfrench@us.ibm.com>2008-04-24 19:26:50 +0400
commit36d99df2fb474222ab47fbe8ae7385661033223b (patch)
tree962e068491b752a944f61c454fad3f8619a1ea3f /arch/arm/mach-iop32x/Kconfig
parent076d8423a98659a92837b07aa494cb74bfefe77c (diff)
parent3dc5063786b273f1aee545844f6bd4e9651ebffe (diff)
downloadlinux-36d99df2fb474222ab47fbe8ae7385661033223b.tar.xz
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-iop32x/Kconfig')
-rw-r--r--arch/arm/mach-iop32x/Kconfig8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-iop32x/Kconfig b/arch/arm/mach-iop32x/Kconfig
index dbe07c9472ed..5e8c6f7dfabb 100644
--- a/arch/arm/mach-iop32x/Kconfig
+++ b/arch/arm/mach-iop32x/Kconfig
@@ -34,14 +34,6 @@ config MACH_N2100
Say Y here if you want to run your kernel on the Thecus n2100
NAS appliance.
-config IOP3XX_ATU
- bool "Enable the PCI Controller"
- default y
- help
- Say Y here if you want the IOP to initialize its PCI Controller.
- Say N if the IOP is an add in card, the host system owns the PCI
- bus in this case.
-
config MACH_EM7210
bool "Enable support for the Lanner EM7210"
help