Browse Source

ide: fix hidden dependencies on CONFIG_IDE_GENERIC

Some host drivers depend on CONFIG_IDE_GENERIC to do the probing but their
config options lack explicit dependencies on IDE_GENERIC.  In the long-term
these host drivers should be fixed to do the probing themselves but for now
fix them by making their config options select CONFIG_IDE_GENERIC.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Bartlomiej Zolnierkiewicz 18 years ago
parent
commit
2195dadf85
3 changed files with 11 additions and 0 deletions
  1. 1 0
      arch/cris/arch-v10/drivers/Kconfig
  2. 1 0
      arch/cris/arch-v32/drivers/Kconfig
  3. 9 0
      drivers/ide/Kconfig

+ 1 - 0
arch/cris/arch-v10/drivers/Kconfig

@@ -548,6 +548,7 @@ config ETRAX_IDE
 	select BLK_DEV_IDEDISK
 	select BLK_DEV_IDEDISK
 	select BLK_DEV_IDECD
 	select BLK_DEV_IDECD
 	select BLK_DEV_IDEDMA
 	select BLK_DEV_IDEDMA
+	select IDE_GENERIC
 	help
 	help
 	  Enable this to get support for ATA/IDE.
 	  Enable this to get support for ATA/IDE.
 	  You can't use parallel ports or SCSI ports
 	  You can't use parallel ports or SCSI ports

+ 1 - 0
arch/cris/arch-v32/drivers/Kconfig

@@ -592,6 +592,7 @@ config ETRAX_IDE
 	select BLK_DEV_IDEDISK
 	select BLK_DEV_IDEDISK
 	select BLK_DEV_IDECD
 	select BLK_DEV_IDECD
 	select BLK_DEV_IDEDMA
 	select BLK_DEV_IDEDMA
+	select IDE_GENERIC
 	help
 	help
 	  Enables the ETRAX IDE driver.
 	  Enables the ETRAX IDE driver.
 
 

+ 9 - 0
drivers/ide/Kconfig

@@ -304,6 +304,7 @@ comment "IDE chipset support/bugfixes"
 
 
 config IDE_GENERIC
 config IDE_GENERIC
 	tristate "generic/default IDE chipset support"
 	tristate "generic/default IDE chipset support"
+	default H8300
 	help
 	help
 	  If unsure, say N.
 	  If unsure, say N.
 
 
@@ -344,6 +345,7 @@ config BLK_DEV_CMD640_ENHANCED
 config BLK_DEV_IDEPNP
 config BLK_DEV_IDEPNP
 	bool "PNP EIDE support"
 	bool "PNP EIDE support"
 	depends on PNP
 	depends on PNP
+	select IDE_GENERIC
 	help
 	help
 	  If you have a PnP (Plug and Play) compatible EIDE card and
 	  If you have a PnP (Plug and Play) compatible EIDE card and
 	  would like the kernel to automatically detect and activate
 	  would like the kernel to automatically detect and activate
@@ -833,6 +835,7 @@ config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
 
 
 config IDE_ARM
 config IDE_ARM
 	def_bool ARM && (ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
 	def_bool ARM && (ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)
+	select IDE_GENERIC
 
 
 config BLK_DEV_IDE_ICSIDE
 config BLK_DEV_IDE_ICSIDE
 	tristate "ICS IDE interface support"
 	tristate "ICS IDE interface support"
@@ -866,6 +869,7 @@ config BLK_DEV_IDE_BAST
 config BLK_DEV_GAYLE
 config BLK_DEV_GAYLE
 	bool "Amiga Gayle IDE interface support"
 	bool "Amiga Gayle IDE interface support"
 	depends on AMIGA
 	depends on AMIGA
+	select IDE_GENERIC
 	help
 	help
 	  This is the IDE driver for the Amiga Gayle IDE interface. It supports
 	  This is the IDE driver for the Amiga Gayle IDE interface. It supports
 	  both the `A1200 style' and `A4000 style' of the Gayle IDE interface,
 	  both the `A1200 style' and `A4000 style' of the Gayle IDE interface,
@@ -897,6 +901,7 @@ config BLK_DEV_IDEDOUBLER
 config BLK_DEV_BUDDHA
 config BLK_DEV_BUDDHA
 	bool "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"
 	bool "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"
 	depends on ZORRO && EXPERIMENTAL
 	depends on ZORRO && EXPERIMENTAL
+	select IDE_GENERIC
 	help
 	help
 	  This is the IDE driver for the IDE interfaces on the Buddha, 
 	  This is the IDE driver for the IDE interfaces on the Buddha, 
 	  Catweasel and X-Surf expansion boards.  It supports up to two interfaces 
 	  Catweasel and X-Surf expansion boards.  It supports up to two interfaces 
@@ -909,6 +914,7 @@ config BLK_DEV_BUDDHA
 config BLK_DEV_FALCON_IDE
 config BLK_DEV_FALCON_IDE
 	bool "Falcon IDE interface support"
 	bool "Falcon IDE interface support"
 	depends on ATARI
 	depends on ATARI
+	select IDE_GENERIC
 	help
 	help
 	  This is the IDE driver for the builtin IDE interface on the Atari
 	  This is the IDE driver for the builtin IDE interface on the Atari
 	  Falcon. Say Y if you have a Falcon and want to use IDE devices (hard
 	  Falcon. Say Y if you have a Falcon and want to use IDE devices (hard
@@ -918,6 +924,7 @@ config BLK_DEV_FALCON_IDE
 config BLK_DEV_MAC_IDE
 config BLK_DEV_MAC_IDE
 	bool "Macintosh Quadra/Powerbook IDE interface support"
 	bool "Macintosh Quadra/Powerbook IDE interface support"
 	depends on MAC
 	depends on MAC
+	select IDE_GENERIC
 	help
 	help
 	  This is the IDE driver for the builtin IDE interface on some m68k
 	  This is the IDE driver for the builtin IDE interface on some m68k
 	  Macintosh models. It supports both the `Quadra style' (used in
 	  Macintosh models. It supports both the `Quadra style' (used in
@@ -931,6 +938,7 @@ config BLK_DEV_MAC_IDE
 config BLK_DEV_Q40IDE
 config BLK_DEV_Q40IDE
 	bool "Q40/Q60 IDE interface support"
 	bool "Q40/Q60 IDE interface support"
 	depends on Q40
 	depends on Q40
+	select IDE_GENERIC
 	help
 	help
 	  Enable the on-board IDE controller in the Q40/Q60.  This should
 	  Enable the on-board IDE controller in the Q40/Q60.  This should
 	  normally be on; disable it only if you are running a custom hard
 	  normally be on; disable it only if you are running a custom hard
@@ -939,6 +947,7 @@ config BLK_DEV_Q40IDE
 config BLK_DEV_MPC8xx_IDE
 config BLK_DEV_MPC8xx_IDE
 	bool "MPC8xx IDE support"
 	bool "MPC8xx IDE support"
 	depends on 8xx && IDE=y && BLK_DEV_IDE=y
 	depends on 8xx && IDE=y && BLK_DEV_IDE=y
+	select IDE_GENERIC
 	help
 	help
 	  This option provides support for IDE on Motorola MPC8xx Systems.
 	  This option provides support for IDE on Motorola MPC8xx Systems.
 	  Please see 'Type of MPC8xx IDE interface' for details.
 	  Please see 'Type of MPC8xx IDE interface' for details.