diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /arch/sparc64/defconfig | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'arch/sparc64/defconfig')
| -rw-r--r-- | arch/sparc64/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 12e9432a7..7e7a45a70 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -136,6 +136,7 @@ CONFIG_IDEDMA_AUTO=y CONFIG_IDEDMA_NEW_DRIVE_LISTINGS=y CONFIG_BLK_DEV_NS87415=y CONFIG_BLK_DEV_CMD64X=y +CONFIG_BLK_DEV_IDE_MODES=y # # Networking options @@ -254,6 +255,7 @@ CONFIG_SCSI_FCAL=m # CONFIG_NETDEVICES=y CONFIG_DUMMY=m +CONFIG_BONDING=m CONFIG_PPP=m # CONFIG_PPP_ASYNC is not set # CONFIG_PPP_SYNC_TTY is not set |