diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /arch/arm/defconfig | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'arch/arm/defconfig')
| -rw-r--r-- | arch/arm/defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/defconfig b/arch/arm/defconfig index ef7d1e315..2aba351c2 100644 --- a/arch/arm/defconfig +++ b/arch/arm/defconfig @@ -18,6 +18,7 @@ CONFIG_ARCH_EBSA285=y CONFIG_ARCH_NETWINDER=y # CONFIG_ARCH_ACORN is not set CONFIG_PCI=y +CONFIG_PCI_NAMES=y CONFIG_ISA_DMA=y CONFIG_CPU_32=y # CONFIG_CPU_26 is not set @@ -91,7 +92,7 @@ CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_BLK_DEV_OPTI621 is not set # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_BLK_DEV_VIA82C586 is not set # CONFIG_BLK_DEV_CMD646 is not set CONFIG_BLK_DEV_SL82C105=y # CONFIG_IDE_CHIPSETS is not set |