diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
| commit | 53b3988d474435254a3b053a68bb24ce9e439295 (patch) | |
| tree | f8da8e40f01f4ad02bbd76b8c9920749b118235f /arch/ppc/defconfig | |
| parent | b0cb48abe83d1a4389ea938bf624f8baa82c5047 (diff) | |
Merge with 2.3.99-pre9.
Diffstat (limited to 'arch/ppc/defconfig')
| -rw-r--r-- | arch/ppc/defconfig | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/ppc/defconfig b/arch/ppc/defconfig index c93118bae..a14aa41ab 100644 --- a/arch/ppc/defconfig +++ b/arch/ppc/defconfig @@ -15,10 +15,11 @@ CONFIG_PPC=y CONFIG_6xx=y # CONFIG_4xx is not set # CONFIG_PPC64 is not set -# CONFIG_82xx is not set +# CONFIG_8260 is not set # CONFIG_8xx is not set CONFIG_ALL_PPC=y # CONFIG_GEMINI is not set +# CONFIG_EST8260 is not set # CONFIG_APUS is not set # CONFIG_SMP is not set CONFIG_ALTIVEC=y @@ -159,10 +160,10 @@ CONFIG_BLK_DEV_IDESCSI=y # CONFIG_BLK_DEV_RZ1000 is not set CONFIG_BLK_DEV_IDEPCI=y # CONFIG_IDEPCI_SHARE_IRQ is not set -# CONFIG_BLK_DEV_IDEDMA_PCI is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_OFFBOARD is not set -# CONFIG_IDEDMA_PCI_AUTO is not set -# CONFIG_BLK_DEV_IDEDMA is not set +CONFIG_IDEDMA_PCI_AUTO=y +CONFIG_BLK_DEV_IDEDMA=y CONFIG_IDEDMA_PCI_EXPERIMENTAL=y # CONFIG_IDEDMA_PCI_WIP is not set # CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set @@ -377,6 +378,11 @@ CONFIG_PPP=y # CONFIG_HAMRADIO is not set # +# IrDA (infrared) support +# +# CONFIG_IRDA is not set + +# # ISDN subsystem # # CONFIG_ISDN is not set @@ -608,6 +614,7 @@ CONFIG_SOUND=y CONFIG_DMASOUND_AWACS=y CONFIG_DMASOUND=y # CONFIG_SOUND_CMPCI is not set +# CONFIG_SOUND_EMU10K1 is not set # CONFIG_SOUND_ES1370 is not set # CONFIG_SOUND_ES1371 is not set # CONFIG_SOUND_ESSSOLO1 is not set |