diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /arch/ppc/defconfig | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'arch/ppc/defconfig')
| -rw-r--r-- | arch/ppc/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ppc/defconfig b/arch/ppc/defconfig index 1f5784701..8717bc055 100644 --- a/arch/ppc/defconfig +++ b/arch/ppc/defconfig @@ -34,6 +34,7 @@ CONFIG_KMOD=y # General setup # # CONFIG_ISA is not set +# CONFIG_SBUS is not set CONFIG_PCI=y CONFIG_NET=y CONFIG_SYSCTL=y @@ -45,6 +46,7 @@ CONFIG_KERNEL_ELF=y # CONFIG_BINFMT_MISC is not set # CONFIG_PCI_NAMES is not set # CONFIG_HOTPLUG is not set +# CONFIG_PCMCIA is not set # # Parallel port support @@ -185,6 +187,7 @@ CONFIG_IDEDMA_PCI_EXPERIMENTAL=y # CONFIG_BLK_DEV_AEC6210 is not set # CONFIG_AEC6210_TUNING is not set # CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_WDC_ALI15X3 is not set # CONFIG_BLK_DEV_AMD7409 is not set # CONFIG_AMD7409_OVERRIDE is not set # CONFIG_BLK_DEV_CMD64X is not set |