ISA support depended on PPC_CHRP which has now been removed, making
ISA unselectable, so remove it.
Signed-off-by: Michael Ellerman <m...@ellerman.id.au>
---
arch/powerpc/Kconfig | 11 -----------
arch/powerpc/configs/chrp32_defconfig | 1 -
arch/powerpc/configs/ppc6xx_defconfig | 1 -
3 files changed, 13 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index f79e28f47dea..958e227a3cbf 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -1083,17 +1083,6 @@ config ISA_DMA_API
menu "Bus options"
-config ISA
- bool "Support for ISA-bus hardware"
- depends on PPC_CHRP
- select PPC_I8259
- help
- Find out whether you have ISA slots on your motherboard. ISA is the
- name of a bus system, i.e. the way the CPU talks to the other stuff
- inside your box. If you have an Apple machine, say N here; if you
- have an IBM RS/6000 or pSeries machine, say Y. If you have an
- embedded board, consult your board documentation.
-
config GENERIC_ISA_DMA
bool
depends on ISA_DMA_API
diff --git a/arch/powerpc/configs/chrp32_defconfig
b/arch/powerpc/configs/chrp32_defconfig
index fb314f75ad4b..88eae3fae0fb 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -20,7 +20,6 @@ CONFIG_GEN_RTC=y
CONFIG_HIGHMEM=y
CONFIG_BINFMT_MISC=y
CONFIG_IRQ_ALL_CPUS=y
-CONFIG_ISA=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig
b/arch/powerpc/configs/ppc6xx_defconfig
index c06344db0eb3..350167bf6d00 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -66,7 +66,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_BINFMT_MISC=y
CONFIG_HIBERNATION=y
CONFIG_PM_DEBUG=y
-CONFIG_ISA=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCI_MSI=y
CONFIG_PCCARD=y
--
2.47.0
