ide: add CONFIG_IDE_H8300 config option

Add a separate config option for ide-8300 host driver instead of depending
on CONFIG_H8300.

This change is a preparation for the future changes and also allows ide-h8300
to be disabled if needed.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 080d7f5d45cc27c53dee8e0e8e30c5263a5c7670..ca8239a2c98a47a4cc3333a0158c1dfb709af1d3 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -313,7 +313,6 @@ comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
        tristate "generic/default IDE chipset support"
-       default H8300
        help
          If unsure, say N.
 
@@ -883,6 +882,14 @@ config BLK_DEV_IDE_BAST
          Say Y here if you want to support the onboard IDE channels on the
          Simtec BAST or the Thorcom VR1000
 
+config IDE_H8300
+       bool "H8300 IDE support"
+       depends on H8300
+       select IDE_GENERIC
+       default y
+       help
+         Enables the H8300 IDE driver.
+
 config BLK_DEV_GAYLE
        bool "Amiga Gayle IDE interface support"
        depends on AMIGA

diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 75dc6969e0a7dfc4e6ed01015c96c21b98387b3c..b181fc672057b7d157c9a1375f148ea8d06c06d1 100644 (file)
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -39,7 +39,7 @@ ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o
 ide-core-$(CONFIG_BLK_DEV_IDE_PMAC)    += ppc/pmac.o
 
 # built-in only drivers from h8300/
-ide-core-$(CONFIG_H8300)               += h8300/ide-h8300.o
+ide-core-$(CONFIG_IDE_H8300)           += h8300/ide-h8300.o
 
 obj-$(CONFIG_BLK_DEV_IDE)              += ide-core.o
 obj-$(CONFIG_IDE_GENERIC)              += ide-generic.o