diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-08-20 16:42:54 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-08-20 16:42:54 -0400 |
commit | 2195dadf853bb32262bd2e5a64f517ae45698c55 (patch) | |
tree | b0a13a944591ffd1d8f578e7995559c5afb92324 /drivers/ide | |
parent | 82a0e70e795ee605e1a34a874dd3a3a43b745fb9 (diff) |
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>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index e7fcdd2580fb..7adb61bad6ad 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -304,6 +304,7 @@ comment "IDE chipset support/bugfixes" | |||
304 | 304 | ||
305 | config IDE_GENERIC | 305 | config IDE_GENERIC |
306 | tristate "generic/default IDE chipset support" | 306 | tristate "generic/default IDE chipset support" |
307 | default H8300 | ||
307 | help | 308 | help |
308 | If unsure, say N. | 309 | If unsure, say N. |
309 | 310 | ||
@@ -344,6 +345,7 @@ config BLK_DEV_CMD640_ENHANCED | |||
344 | config BLK_DEV_IDEPNP | 345 | config BLK_DEV_IDEPNP |
345 | bool "PNP EIDE support" | 346 | bool "PNP EIDE support" |
346 | depends on PNP | 347 | depends on PNP |
348 | select IDE_GENERIC | ||
347 | help | 349 | help |
348 | If you have a PnP (Plug and Play) compatible EIDE card and | 350 | If you have a PnP (Plug and Play) compatible EIDE card and |
349 | would like the kernel to automatically detect and activate | 351 | would like the kernel to automatically detect and activate |
@@ -833,6 +835,7 @@ config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ | |||
833 | 835 | ||
834 | config IDE_ARM | 836 | config IDE_ARM |
835 | def_bool ARM && (ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK) | 837 | def_bool ARM && (ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK) |
838 | select IDE_GENERIC | ||
836 | 839 | ||
837 | config BLK_DEV_IDE_ICSIDE | 840 | config BLK_DEV_IDE_ICSIDE |
838 | tristate "ICS IDE interface support" | 841 | tristate "ICS IDE interface support" |
@@ -866,6 +869,7 @@ config BLK_DEV_IDE_BAST | |||
866 | config BLK_DEV_GAYLE | 869 | config BLK_DEV_GAYLE |
867 | bool "Amiga Gayle IDE interface support" | 870 | bool "Amiga Gayle IDE interface support" |
868 | depends on AMIGA | 871 | depends on AMIGA |
872 | select IDE_GENERIC | ||
869 | help | 873 | help |
870 | This is the IDE driver for the Amiga Gayle IDE interface. It supports | 874 | This is the IDE driver for the Amiga Gayle IDE interface. It supports |
871 | both the `A1200 style' and `A4000 style' of the Gayle IDE interface, | 875 | both the `A1200 style' and `A4000 style' of the Gayle IDE interface, |
@@ -897,6 +901,7 @@ config BLK_DEV_IDEDOUBLER | |||
897 | config BLK_DEV_BUDDHA | 901 | config BLK_DEV_BUDDHA |
898 | bool "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)" | 902 | bool "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)" |
899 | depends on ZORRO && EXPERIMENTAL | 903 | depends on ZORRO && EXPERIMENTAL |
904 | select IDE_GENERIC | ||
900 | help | 905 | help |
901 | This is the IDE driver for the IDE interfaces on the Buddha, | 906 | This is the IDE driver for the IDE interfaces on the Buddha, |
902 | Catweasel and X-Surf expansion boards. It supports up to two interfaces | 907 | Catweasel and X-Surf expansion boards. It supports up to two interfaces |
@@ -909,6 +914,7 @@ config BLK_DEV_BUDDHA | |||
909 | config BLK_DEV_FALCON_IDE | 914 | config BLK_DEV_FALCON_IDE |
910 | bool "Falcon IDE interface support" | 915 | bool "Falcon IDE interface support" |
911 | depends on ATARI | 916 | depends on ATARI |
917 | select IDE_GENERIC | ||
912 | help | 918 | help |
913 | This is the IDE driver for the builtin IDE interface on the Atari | 919 | This is the IDE driver for the builtin IDE interface on the Atari |
914 | Falcon. Say Y if you have a Falcon and want to use IDE devices (hard | 920 | Falcon. Say Y if you have a Falcon and want to use IDE devices (hard |
@@ -918,6 +924,7 @@ config BLK_DEV_FALCON_IDE | |||
918 | config BLK_DEV_MAC_IDE | 924 | config BLK_DEV_MAC_IDE |
919 | bool "Macintosh Quadra/Powerbook IDE interface support" | 925 | bool "Macintosh Quadra/Powerbook IDE interface support" |
920 | depends on MAC | 926 | depends on MAC |
927 | select IDE_GENERIC | ||
921 | help | 928 | help |
922 | This is the IDE driver for the builtin IDE interface on some m68k | 929 | This is the IDE driver for the builtin IDE interface on some m68k |
923 | Macintosh models. It supports both the `Quadra style' (used in | 930 | Macintosh models. It supports both the `Quadra style' (used in |
@@ -931,6 +938,7 @@ config BLK_DEV_MAC_IDE | |||
931 | config BLK_DEV_Q40IDE | 938 | config BLK_DEV_Q40IDE |
932 | bool "Q40/Q60 IDE interface support" | 939 | bool "Q40/Q60 IDE interface support" |
933 | depends on Q40 | 940 | depends on Q40 |
941 | select IDE_GENERIC | ||
934 | help | 942 | help |
935 | Enable the on-board IDE controller in the Q40/Q60. This should | 943 | Enable the on-board IDE controller in the Q40/Q60. This should |
936 | normally be on; disable it only if you are running a custom hard | 944 | normally be on; disable it only if you are running a custom hard |
@@ -939,6 +947,7 @@ config BLK_DEV_Q40IDE | |||
939 | config BLK_DEV_MPC8xx_IDE | 947 | config BLK_DEV_MPC8xx_IDE |
940 | bool "MPC8xx IDE support" | 948 | bool "MPC8xx IDE support" |
941 | depends on 8xx && IDE=y && BLK_DEV_IDE=y | 949 | depends on 8xx && IDE=y && BLK_DEV_IDE=y |
950 | select IDE_GENERIC | ||
942 | help | 951 | help |
943 | This option provides support for IDE on Motorola MPC8xx Systems. | 952 | This option provides support for IDE on Motorola MPC8xx Systems. |
944 | Please see 'Type of MPC8xx IDE interface' for details. | 953 | Please see 'Type of MPC8xx IDE interface' for details. |