[PATCH] move io scheduler kconfig entries

Currently they are in the generic setup, pretty confusing. This patch
moves the io scheduler selection into a seperate menu under block
devices.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index b84f45f36950b63f23ddb9000a96193d7d51b4cb..a189ab281a9e79fbb906e4a0025558e914f95b75 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -417,4 +417,6 @@ config CDROM_PKTCDVD_WCACHE
 
 source "drivers/s390/block/Kconfig"
 
+source "drivers/block/Kconfig.iosched"
+
 endmenu

diff --git a/drivers/block/Kconfig.iosched b/drivers/block/Kconfig.iosched
index e0ba6c93717eb654bbbdf178a5843b54d59f70aa..6070a480600b6ba2e24902e70a48a71290faaf7c 100644 (file)
--- a/drivers/block/Kconfig.iosched
+++ b/drivers/block/Kconfig.iosched
@@ -1,3 +1,6 @@
+
+menu "IO Schedulers"
+
 config IOSCHED_NOOP
        bool
        default y
@@ -34,3 +37,5 @@ config IOSCHED_CFQ
          The CFQ I/O scheduler tries to distribute bandwidth equally
          among all processes in the system. It should provide a fair
          working environment, suitable for desktop systems.
+
+endmenu

diff --git a/init/Kconfig b/init/Kconfig
index 6dcf85f3d7965898391f4fe726faef797af33eff..ee534ff7ea91c664d32461d356d0243e324018e5 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -297,8 +297,6 @@ config EPOLL
          Disabling this option will cause the kernel to be built without
          support for epoll family of system calls.
 
-source "drivers/block/Kconfig.iosched"
-
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size" if EMBEDDED
        default y if ARM || H8300