diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /arch/sparc/defconfig | |
parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) |
Merge with 2.3.99-pre1.
Diffstat (limited to 'arch/sparc/defconfig')
-rw-r--r-- | arch/sparc/defconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig index e719d9214..de483af6e 100644 --- a/arch/sparc/defconfig +++ b/arch/sparc/defconfig @@ -101,7 +101,6 @@ CONFIG_KMOD=y # Floppy, IDE, and other block devices # CONFIG_BLK_DEV_FD=y -# CONFIG_BLK_DEV_IDE is not set CONFIG_BLK_DEV_MD=y CONFIG_MD_LINEAR=m CONFIG_MD_STRIPED=m @@ -170,6 +169,11 @@ CONFIG_DECNET_SIOCGIFCONF=y # CONFIG_ISDN is not set # +# ATA/IDE/MFM/RLL support +# +# CONFIG_IDE is not set + +# # SCSI support # CONFIG_SCSI=y |