Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 4 insertions, 11 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 9040809d2c25..b1a9b81c211f 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