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/m68k | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/config.in | 13 | ||||
| -rw-r--r-- | arch/m68k/defconfig | 12 |
2 files changed, 18 insertions, 7 deletions
diff --git a/arch/m68k/config.in b/arch/m68k/config.in index 5b12f470e..52b81739e 100644 --- a/arch/m68k/config.in +++ b/arch/m68k/config.in @@ -152,6 +152,19 @@ if [ "$CONFIG_NET" = "y" ]; then fi mainmenu_option next_comment +comment 'ATA/IDE/MFM/RLL support' + +tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE + +if [ "$CONFIG_IDE" != "n" ]; then + source drivers/ide/Config.in +else + define_bool CONFIG_BLK_DEV_IDE_MODES n + define_bool CONFIG_BLK_DEV_HD n +fi +endmenu + +mainmenu_option next_comment comment 'SCSI support' tristate 'SCSI support' CONFIG_SCSI diff --git a/arch/m68k/defconfig b/arch/m68k/defconfig index cbea6ba63..e11c32b95 100644 --- a/arch/m68k/defconfig +++ b/arch/m68k/defconfig @@ -56,13 +56,6 @@ CONFIG_PROC_HARDWARE=y CONFIG_AMIGA_FLOPPY=y CONFIG_ATARI_FLOPPY=y # CONFIG_BLK_DEV_LOOP is not set -# CONFIG_BLK_DEV_IDE is not set -# CONFIG_BLK_DEV_IDEDISK is not set -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_BLK_DEV_IDEDOUBLER is not set # CONFIG_AMIGA_Z2RAM is not set # CONFIG_ATARI_ACSI is not set # CONFIG_ACSI_MULTI_LUN is not set @@ -121,6 +114,11 @@ CONFIG_IP_NOSR=y # CONFIG_NET_SCHED is not set # +# ATA/IDE/MFM/RLL support +# +# CONFIG_IDE is not set + +# # SCSI support # CONFIG_SCSI=y |