diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-11-29 20:14:51 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-11-29 20:14:51 -0500 |
commit | aa414dff4f7bef29457592414551becdca72dd6b (patch) | |
tree | a9d12b4f7d31b04fab826c1e36b5046798382adf /arch/mips/Kconfig | |
parent | 0b7883f49810ec91755caa222b3b28f047b8c93b (diff) |
[MIPS] Remove duplicate ISA DMA code for 0 DMA channel case.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index c0da0ffe8d57..96143670759c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -266,8 +266,8 @@ config MIPS_MALTA | |||
266 | select BOOT_ELF32 | 266 | select BOOT_ELF32 |
267 | select HAVE_STD_PC_SERIAL_PORT | 267 | select HAVE_STD_PC_SERIAL_PORT |
268 | select DMA_NONCOHERENT | 268 | select DMA_NONCOHERENT |
269 | select IRQ_CPU | ||
270 | select GENERIC_ISA_DMA | 269 | select GENERIC_ISA_DMA |
270 | select IRQ_CPU | ||
271 | select HW_HAS_PCI | 271 | select HW_HAS_PCI |
272 | select I8259 | 272 | select I8259 |
273 | select MIPS_BOARDS_GEN | 273 | select MIPS_BOARDS_GEN |
@@ -534,7 +534,7 @@ config SGI_IP22 | |||
534 | select HW_HAS_EISA | 534 | select HW_HAS_EISA |
535 | select IP22_CPU_SCACHE | 535 | select IP22_CPU_SCACHE |
536 | select IRQ_CPU | 536 | select IRQ_CPU |
537 | select NO_ISA if ISA | 537 | select GENERIC_ISA_DMA_SUPPORT_BROKEN |
538 | select SWAP_IO_SPACE | 538 | select SWAP_IO_SPACE |
539 | select SYS_HAS_CPU_R4X00 | 539 | select SYS_HAS_CPU_R4X00 |
540 | select SYS_HAS_CPU_R5000 | 540 | select SYS_HAS_CPU_R5000 |
@@ -881,6 +881,9 @@ config MIPS_NILE4 | |||
881 | config MIPS_DISABLE_OBSOLETE_IDE | 881 | config MIPS_DISABLE_OBSOLETE_IDE |
882 | bool | 882 | bool |
883 | 883 | ||
884 | config GENERIC_ISA_DMA_SUPPORT_BROKEN | ||
885 | bool | ||
886 | |||
884 | # | 887 | # |
885 | # Endianess selection. Suffiently obscure so many users don't know what to | 888 | # Endianess selection. Suffiently obscure so many users don't know what to |
886 | # answer,so we try hard to limit the available choices. Also the use of a | 889 | # answer,so we try hard to limit the available choices. Also the use of a |
@@ -1852,13 +1855,11 @@ source "drivers/pci/Kconfig" | |||
1852 | config ISA | 1855 | config ISA |
1853 | bool | 1856 | bool |
1854 | 1857 | ||
1855 | config NO_ISA | ||
1856 | bool | ||
1857 | |||
1858 | config EISA | 1858 | config EISA |
1859 | bool "EISA support" | 1859 | bool "EISA support" |
1860 | depends on HW_HAS_EISA | 1860 | depends on HW_HAS_EISA |
1861 | select ISA | 1861 | select ISA |
1862 | select GENERIC_ISA_DMA | ||
1862 | ---help--- | 1863 | ---help--- |
1863 | The Extended Industry Standard Architecture (EISA) bus was | 1864 | The Extended Industry Standard Architecture (EISA) bus was |
1864 | developed as an open alternative to the IBM MicroChannel bus. | 1865 | developed as an open alternative to the IBM MicroChannel bus. |