ide: remove CONFIG_BLK_DEV_IDEDOUBLER config option

Nowadays it is not worth having a separate config option for
Amiga IDE Doubler support so always include it (it still needs
to be explicitly enabled by module parameter).

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 9 insertions, 26 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 896424445f65..4d2f2a6b5bdb 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -770,27 +770,20 @@ config BLK_DEV_GAYLE
           This includes on-board IDE interfaces on some Amiga models (A600,
           A1200, A4000, and A4000T), and IDE interfaces on the Zorro expansion
           bus (M-Tech E-Matrix 530 expansion card).
-          Say Y if you have an Amiga with a Gayle IDE interface and want to use
-          IDE devices (hard disks, CD-ROM drives, etc.) that are connected to
-          it.
-          Note that you also have to enable Zorro bus support if you want to
-          use Gayle IDE interfaces on the Zorro expansion bus.
 
-config BLK_DEV_IDEDOUBLER
-        bool "Amiga IDE Doubler support (EXPERIMENTAL)"
-        depends on BLK_DEV_GAYLE && EXPERIMENTAL
-        ---help---
-          This feature provides support for the so-called `IDE doublers' (made
+          It also provides support for the so-called `IDE doublers' (made
           by various manufacturers, e.g. Eyetech) that can be connected to
           the on-board IDE interface of some Amiga models. Using such an IDE
           doubler, you can connect up to four instead of two IDE devices to
-          the Amiga's on-board IDE interface.
+          the Amiga's on-board IDE interface. The feature is enabled at kernel
+          runtime using the "gayle.doubler" kernel boot parameter.
 
-          Note that the normal Amiga Gayle IDE driver may not work correctly
-          if you have an IDE doubler and don't enable this feature!
+          Say Y if you have an Amiga with a Gayle IDE interface and want to use
+          IDE devices (hard disks, CD-ROM drives, etc.) that are connected to
+          it.
 
-          Say Y if you have an IDE doubler.  The feature is enabled at kernel
-          runtime using the "gayle.doubler" kernel boot parameter.
+          Note that you also have to enable Zorro bus support if you want to
+          use Gayle IDE interfaces on the Zorro expansion bus.
 
 config BLK_DEV_BUDDHA
         tristate "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"
diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c
index dc778251cb05..c7119516c5a7 100644
--- a/drivers/ide/gayle.c
+++ b/drivers/ide/gayle.c
@@ -53,11 +53,6 @@
 
 #define GAYLE_NEXT_PORT 0x1000
 
-#ifndef CONFIG_BLK_DEV_IDEDOUBLER
-#define GAYLE_NUM_HWIFS         1
-#define GAYLE_NUM_PROBE_HWIFS   GAYLE_NUM_HWIFS
-#define GAYLE_HAS_CONTROL_REG   1
-#else /* CONFIG_BLK_DEV_IDEDOUBLER */
 #define GAYLE_NUM_HWIFS         2
 #define GAYLE_NUM_PROBE_HWIFS   (ide_doubler ? GAYLE_NUM_HWIFS : \
                                                GAYLE_NUM_HWIFS-1)
@@ -66,8 +61,6 @@
 static int ide_doubler;
 module_param_named(doubler, ide_doubler, bool, 0);
 MODULE_PARM_DESC(doubler, "enable support for IDE doublers");
-#endif /* CONFIG_BLK_DEV_IDEDOUBLER */
-
 
     /*
      *  Check and acknowledge the interrupt status
@@ -151,10 +144,7 @@ static int __init gayle_init(void)
 found:
         printk(KERN_INFO "ide: Gayle IDE controller (A%d style%s)\n",
                          a4000 ? 4000 : 1200,
-#ifdef CONFIG_BLK_DEV_IDEDOUBLER
-                         ide_doubler ? ", IDE doubler" :
-#endif
-                         "");
+                         ide_doubler ? ", IDE doubler" : "");
 
         if (a4000) {
             phys_base = GAYLE_BASE_4000;