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

Commit 452a8ed8 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove CONFIG_BLK_DEV_IDE config option (take 2) 



Because hd.c was moved to drivers/block/ this config option
is superfluous now and may be removed.

v2:
Fix drivers/ide/Makefile (noticed by Adrian Bunk).

Cc: Adrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent baf08f0b

drivers/ide/Kconfig

+2 −36
Original line number Original line Diff line number Diff line
@@ -54,38 +54,6 @@ menuconfig IDE 




if IDE

if IDE





config BLK_DEV_IDE

	tristate "Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy support"

	---help---

	  If you say Y here, you will use the full-featured IDE driver to

	  control up to ten ATA/IDE interfaces, each being able to serve a

	  "master" and a "slave" device, for a total of up to twenty ATA/IDE

	  disk/cdrom/tape/floppy drives.



	  Useful information about large (>540 MB) IDE disks, multiple

	  interfaces, what to do if ATA/IDE devices are not automatically

	  detected, sound card ATA/IDE ports, module support, and other

	  topics, is contained in <file:Documentation/ide/ide.txt>. For detailed

	  information about hard drives, consult the Disk-HOWTO and the

	  Multi-Disk-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



	  To fine-tune ATA/IDE drive/interface parameters for improved

	  performance, look for the hdparm package at

	  <ftp://ibiblio.org/pub/Linux/system/hardware/>.



	  To compile this driver as a module, choose M here and read

	  <file:Documentation/ide/ide.txt>. The module will be called ide-mod.

	  Do not compile this driver as a module if your root file system (the

	  one containing the directory /) is located on an IDE device.



	  If you have one or more IDE drives, say Y or M here. If your system

	  has no IDE drives, or if memory requirements are really tight, you

	  could say N here, and select the "Old hard disk driver" below

	  instead to save about 13 KB of memory in the kernel.



if BLK_DEV_IDE



comment "Please see Documentation/ide/ide.txt for help/info on IDE drives"

comment "Please see Documentation/ide/ide.txt for help/info on IDE drives"





config IDE_TIMINGS

config IDE_TIMINGS
@@ -348,7 +316,7 @@ config BLK_DEV_IDEPCI 




config IDEPCI_PCIBUS_ORDER

config IDEPCI_PCIBUS_ORDER

	bool "Probe IDE PCI devices in the PCI bus order (DEPRECATED)"

	bool "Probe IDE PCI devices in the PCI bus order (DEPRECATED)"

	depends on BLK_DEV_IDE=y && BLK_DEV_IDEPCI

	depends on IDE=y && BLK_DEV_IDEPCI

	default y

	default y

	help

	help

	  Probe IDE PCI devices in the order in which they appear on the

	  Probe IDE PCI devices in the order in which they appear on the
@@ -729,7 +697,7 @@ endif 




config BLK_DEV_IDE_PMAC

config BLK_DEV_IDE_PMAC

	tristate "PowerMac on-board IDE support"

	tristate "PowerMac on-board IDE support"

	depends on PPC_PMAC && IDE=y && BLK_DEV_IDE=y

	depends on PPC_PMAC && IDE=y

	select IDE_TIMINGS

	select IDE_TIMINGS

	help

	help

	  This driver provides support for the on-board IDE controller on

	  This driver provides support for the on-board IDE controller on
@@ -963,6 +931,4 @@ config BLK_DEV_IDEDMA 
	def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \

	def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \

		 BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA

		 BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA





endif



endif # IDE
 
endif # IDE

drivers/ide/Makefile

+4 −4
Original line number Original line Diff line number Diff line
@@ -15,14 +15,14 @@ ide-core-$(CONFIG_BLK_DEV_IDEDMA) += ide-dma.o 
ide-core-$(CONFIG_IDE_PROC_FS)		+= ide-proc.o

ide-core-$(CONFIG_IDE_PROC_FS)		+= ide-proc.o

ide-core-$(CONFIG_BLK_DEV_IDEACPI)	+= ide-acpi.o

ide-core-$(CONFIG_BLK_DEV_IDEACPI)	+= ide-acpi.o





obj-$(CONFIG_BLK_DEV_IDE)		+= ide-core.o

obj-$(CONFIG_IDE)			+= ide-core.o





ifeq ($(CONFIG_IDE_ARM), y)

ifeq ($(CONFIG_IDE_ARM), y)

	ide-arm-core-y += arm/ide_arm.o

	ide-arm-core-y += arm/ide_arm.o

	obj-y += ide-arm-core.o

	obj-y += ide-arm-core.o

endif

endif





obj-$(CONFIG_BLK_DEV_IDE)		+= legacy/ pci/

obj-$(CONFIG_IDE)			+= legacy/ pci/





obj-$(CONFIG_IDEPCI_PCIBUS_ORDER)	+= ide-scan-pci.o

obj-$(CONFIG_IDEPCI_PCIBUS_ORDER)	+= ide-scan-pci.o
@@ -31,7 +31,7 @@ ifeq ($(CONFIG_BLK_DEV_CMD640), y) 
	obj-y += cmd640-core.o

	obj-y += cmd640-core.o

endif

endif





obj-$(CONFIG_BLK_DEV_IDE)		+= ppc/

obj-$(CONFIG_IDE)			+= ppc/

obj-$(CONFIG_IDE_H8300)			+= h8300/

obj-$(CONFIG_IDE_H8300)			+= h8300/

obj-$(CONFIG_IDE_GENERIC)		+= ide-generic.o

obj-$(CONFIG_IDE_GENERIC)		+= ide-generic.o

obj-$(CONFIG_BLK_DEV_IDEPNP)		+= ide-pnp.o

obj-$(CONFIG_BLK_DEV_IDEPNP)		+= ide-pnp.o
@@ -54,4 +54,4 @@ ifeq ($(CONFIG_BLK_DEV_PLATFORM), y) 
	obj-y += ide-platform-core.o

	obj-y += ide-platform-core.o

endif

endif





obj-$(CONFIG_BLK_DEV_IDE)		+= arm/ mips/
 
obj-$(CONFIG_IDE)			+= arm/ mips/