aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-11-27 15:35:54 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-11-27 15:35:54 -0500
commitacfad6e186664fa8521662bb7992ff6508f9357b (patch)
tree9a459789d5b6c39ef67884872e918788741e66c1
parentc5d252cbe9044054476498df163d99cb5a6d0ba8 (diff)
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>
-rw-r--r--drivers/ide/Kconfig9
-rw-r--r--drivers/ide/Makefile2
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 080d7f5d45cc..ca8239a2c98a 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -313,7 +313,6 @@ comment "IDE chipset support/bugfixes"
313 313
314config IDE_GENERIC 314config IDE_GENERIC
315 tristate "generic/default IDE chipset support" 315 tristate "generic/default IDE chipset support"
316 default H8300
317 help 316 help
318 If unsure, say N. 317 If unsure, say N.
319 318
@@ -883,6 +882,14 @@ config BLK_DEV_IDE_BAST
883 Say Y here if you want to support the onboard IDE channels on the 882 Say Y here if you want to support the onboard IDE channels on the
884 Simtec BAST or the Thorcom VR1000 883 Simtec BAST or the Thorcom VR1000
885 884
885config IDE_H8300
886 bool "H8300 IDE support"
887 depends on H8300
888 select IDE_GENERIC
889 default y
890 help
891 Enables the H8300 IDE driver.
892
886config BLK_DEV_GAYLE 893config BLK_DEV_GAYLE
887 bool "Amiga Gayle IDE interface support" 894 bool "Amiga Gayle IDE interface support"
888 depends on AMIGA 895 depends on AMIGA
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 75dc6969e0a7..b181fc672057 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -39,7 +39,7 @@ ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o
39ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += ppc/pmac.o 39ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += ppc/pmac.o
40 40
41# built-in only drivers from h8300/ 41# built-in only drivers from h8300/
42ide-core-$(CONFIG_H8300) += h8300/ide-h8300.o 42ide-core-$(CONFIG_IDE_H8300) += h8300/ide-h8300.o
43 43
44obj-$(CONFIG_BLK_DEV_IDE) += ide-core.o 44obj-$(CONFIG_BLK_DEV_IDE) += ide-core.o
45obj-$(CONFIG_IDE_GENERIC) += ide-generic.o 45obj-$(CONFIG_IDE_GENERIC) += ide-generic.o