summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-10-27 10:36:55 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-10-27 10:36:55 +0900
commit7693465d81827107caf9c447b9ad91098a1c4941 (patch)
treee47345c26eb252578a78a33b0840d49d88624f3c /arch
parent01be5d63fd4645eab1d05a7caa04462c11c8b7a1 (diff)
downloadblackbird-op-linux-7693465d81827107caf9c447b9ad91098a1c4941.tar.gz
blackbird-op-linux-7693465d81827107caf9c447b9ad91098a1c4941.zip
sh: Kill off superfluous arch/sh/drivers/pci/Kconfig.
Now that this contains a grand total of 1 Kconfig option, it's hardly worth keeping split out. Roll CONFIG_PCI back in to the top-level architecture Kconfig, along with the other bus types. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/Kconfig8
-rw-r--r--arch/sh/drivers/pci/Kconfig7
2 files changed, 7 insertions, 8 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index e5ee3b159e50..1481df2cb2e3 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -811,7 +811,13 @@ config MAPLE
Dreamcast with a serial line terminal or a remote network
connection.
-source "arch/sh/drivers/pci/Kconfig"
+config PCI
+ bool "PCI support"
+ depends on SYS_SUPPORTS_PCI
+ help
+ Find out whether you have a PCI motherboard. PCI is the name of a
+ bus system, i.e. the way the CPU talks to the other stuff inside
+ your box. If you have PCI, say Y, otherwise N.
source "drivers/pci/pcie/Kconfig"
diff --git a/arch/sh/drivers/pci/Kconfig b/arch/sh/drivers/pci/Kconfig
deleted file mode 100644
index 78a3ce1e6c4d..000000000000
--- a/arch/sh/drivers/pci/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-config PCI
- bool "PCI support"
- depends on SYS_SUPPORTS_PCI
- help
- Find out whether you have a PCI motherboard. PCI is the name of a
- bus system, i.e. the way the CPU talks to the other stuff inside
- your box. If you have PCI, say Y, otherwise N.
OpenPOWER on IntegriCloud