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/alpha | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/config.in | 13 | ||||
| -rw-r--r-- | arch/alpha/defconfig | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/arch/alpha/config.in b/arch/alpha/config.in index 6e760c917..df7ae01ca 100644 --- a/arch/alpha/config.in +++ b/arch/alpha/config.in @@ -223,6 +223,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/alpha/defconfig b/arch/alpha/defconfig index cc244e560..c4752a216 100644 --- a/arch/alpha/defconfig +++ b/arch/alpha/defconfig @@ -70,12 +70,6 @@ CONFIG_BINFMT_EM86=y # Block devices # CONFIG_BLK_DEV_FD=y -# CONFIG_BLK_DEV_IDE is not set - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_HD_ONLY is not set # CONFIG_BLK_CPQ_DA is not set # @@ -89,8 +83,6 @@ CONFIG_BLK_DEV_FD=y # CONFIG_BLK_DEV_DAC960 is not set CONFIG_PARIDE_PARPORT=y # CONFIG_PARIDE is not set -# CONFIG_BLK_DEV_IDE_MODES is not set -# CONFIG_BLK_DEV_HD is not set # # Networking options @@ -123,6 +115,11 @@ CONFIG_SKB_LARGE=y # CONFIG_ATALK is not set # +# ATA/IDE/MFM/RLL support +# +# CONFIG_IDE is not set + +# # SCSI support # CONFIG_SCSI=y |