diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /arch/arm/config.in | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'arch/arm/config.in')
| -rw-r--r-- | arch/arm/config.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/config.in b/arch/arm/config.in index 2ff7f6414..cf6312fc1 100644 --- a/arch/arm/config.in +++ b/arch/arm/config.in @@ -119,6 +119,8 @@ if [ "$CONFIG_ARCH_NEXUSPCI" = "y" -o \ "$CONFIG_HOST_FOOTBRIDGE" = "y" ]; then define_bool CONFIG_PCI y source drivers/pci/Config.in +else + define_bool CONFIG_PCI n fi # @@ -127,8 +129,10 @@ fi if [ "$CONFIG_ARCH_CATS" = "y" -o \ "$CONFIG_ARCH_SHARK" = "y" -o \ "$CONFIG_ARCH_NETWINDER" = "y" ]; then + define_bool CONFIG_ISA y define_bool CONFIG_ISA_DMA y else + define_bool CONFIG_ISA n define_bool CONFIG_ISA_DMA n fi |