diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-16 16:50:37 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-16 16:50:37 -0400 |
commit | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (patch) | |
tree | 7e81977adbd73e154f53861d8577d3ab92611c8c /drivers/ide/Kconfig | |
parent | 6684e323a236d40461f27d36b38c6b70aabc9e71 (diff) | |
parent | 7b104bcb8e460e45a1aebe3da9b86aacdb4cab12 (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/ide/Kconfig')
-rw-r--r-- | drivers/ide/Kconfig | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 9040809d2c2..b1a9b81c211 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -4,13 +4,10 @@ # Andre Hedrick <andre@linux-ide.org> # -if BLOCK - -menu "ATA/ATAPI/MFM/RLL support" - depends on HAS_IOMEM - -config IDE +menuconfig IDE tristate "ATA/ATAPI/MFM/RLL support" + depends on BLOCK + depends on HAS_IOMEM ---help--- If you say Y here, your kernel will be able to manage low cost mass storage units such as ATA/(E)IDE and ATAPI units. The most common @@ -1099,8 +1096,4 @@ config BLK_DEV_HD_ONLY config BLK_DEV_HD def_bool BLK_DEV_HD_IDE || BLK_DEV_HD_ONLY -endif - -endmenu - -endif +endif # IDE |