move ide/legacy/hd.c to drivers/block/

This patch moves hd.c to drivers/block/

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: rmk@arm.linux.org.uk
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 0d1d2133d9bc239fe800a3e64c05ceef6c1e898a..c3909743c484c800b10c23654c72fadc1d5a8bad 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -433,4 +433,28 @@ config VIRTIO_BLK
          This is the virtual block driver for virtio.  It can be used with
           lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
 
+config BLK_DEV_HD
+       bool "Old hard disk (MFM/RLL/IDE) driver"
+       depends on HAVE_IDE
+       depends on !ARM || ARCH_RPC || ARCH_SHARK || BROKEN
+       help
+         There are two drivers for MFM/RLL/IDE hard disks. Most people use
+         the newer enhanced driver, but this old one is still around for two
+         reasons. Some older systems have strange timing problems and seem to
+         work only with the old driver (which itself does not work with some
+         newer systems). The other reason is that the old driver is smaller,
+         since it lacks the enhanced functionality of the new one. This makes
+         it a good choice for systems with very tight memory restrictions, or
+         for systems with only older MFM/RLL/ESDI drives. Choosing the old
+         driver can save 13 KB or so of kernel memory.
+
+         If you want to use this driver together with the new one you have
+         to use "hda=noprobe hdb=noprobe" kernel parameters to prevent the new
+         driver from probing the primary interface.
+
+         If you are unsure, then just choose the Enhanced IDE/MFM/RLL driver
+         instead of this one. For more detailed information, read the
+         Disk-HOWTO, available from
+         <http://www.tldp.org/docs.html#howto>.
+
 endif # BLK_DEV

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 5e584306be9992aae29c39a0c7221bdc82f053c8..204332b29578f7911ba4b73eb808ddfe21ff1246 100644 (file)
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -29,5 +29,6 @@ obj-$(CONFIG_VIRTIO_BLK)      += virtio_blk.o
 obj-$(CONFIG_VIODASD)          += viodasd.o
 obj-$(CONFIG_BLK_DEV_SX8)      += sx8.o
 obj-$(CONFIG_BLK_DEV_UB)       += ub.o
+obj-$(CONFIG_BLK_DEV_HD)       += hd.o
 
 obj-$(CONFIG_XEN_BLKDEV_FRONTEND)      += xen-blkfront.o

diff --git a/drivers/ide/legacy/hd.c b/drivers/block/hd.c
similarity index 100%
rename from drivers/ide/legacy/hd.c
rename to drivers/block/hd.c

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 39b95f9c2ad128041bff88ac397caefc1c2152b9..15b09b89588a033b1e6f967b05f5fe8615286e08 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -1000,27 +1000,4 @@ config BLK_DEV_IDEDMA
 
 endif
 
-config BLK_DEV_HD
-       bool "Old hard disk (MFM/RLL/IDE) driver"
-       depends on !ARM || ARCH_RPC || ARCH_SHARK || BROKEN
-       help
-         There are two drivers for MFM/RLL/IDE hard disks. Most people use
-         the newer enhanced driver, but this old one is still around for two
-         reasons. Some older systems have strange timing problems and seem to
-         work only with the old driver (which itself does not work with some
-         newer systems). The other reason is that the old driver is smaller,
-         since it lacks the enhanced functionality of the new one. This makes
-         it a good choice for systems with very tight memory restrictions, or
-         for systems with only older MFM/RLL/ESDI drives. Choosing the old
-         driver can save 13 KB or so of kernel memory.
-
-         If you want to use this driver together with the new one you have
-         to use "hda=noprobe hdb=noprobe" kernel parameters to prevent the new
-         driver from probing the primary interface.
-
-         If you are unsure, then just choose the Enhanced IDE/MFM/RLL driver
-         instead of this one. For more detailed information, read the
-         Disk-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>.
-
 endif # IDE

diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 39e99ace5cd3485b7466848aba3c4684237e9c88..5d414e301a5a9c319a23e9da0463ca0231035e5c 100644 (file)
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -61,8 +61,3 @@ ifeq ($(CONFIG_BLK_DEV_PLATFORM), y)
 endif
 
 obj-$(CONFIG_BLK_DEV_IDE)              += arm/ mips/
-
-ifeq ($(CONFIG_BLK_DEV_HD), y)
-       hd-core-y += legacy/hd.o
-       obj-y += hd-core.o
-endif