Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 453ea3ed authored by Adrian Bunk's avatar Adrian Bunk Committed by Bartlomiej Zolnierkiewicz
Browse files

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



This patch moves hd.c to drivers/block/

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Cc: rmk@arm.linux.org.uk
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 01c22bfc

drivers/block/Kconfig

+24 −0
Original line number Diff line number Diff line
@@ -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

drivers/block/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/ide/legacy/hd.c→drivers/block/hd.c

+0 −0

File moved.

View file

drivers/ide/Kconfig

+0 −23
Original line number Diff line number Diff line
@@ -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

drivers/ide/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -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