gayle: add "doubler" parameter

* Add "doubler" parameter to enable support for IDE doublers.

* Obsolete "ide=doubler" kernel parameter.

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

2 files changed, 3 insertions, 1 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index a4bceeecde70..a017eb242604 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -866,7 +866,7 @@ static int __init ide_setup(char *s)
 
                 printk(" : Enabled support for IDE doublers\n");
                 ide_doubler = 1;
-                return 1;
+                goto obsolete_option;
         }
 #endif /* CONFIG_BLK_DEV_IDEDOUBLER */
 
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index a0c9601bdaf0..61a713bf24b5 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -63,6 +63,8 @@
 #define GAYLE_HAS_CONTROL_REG   (!ide_doubler)
 #define GAYLE_IDEREG_SIZE       (ide_doubler ? 0x1000 : 0x2000)
 int ide_doubler = 0;    /* support IDE doublers? */
+module_param_named(doubler, ide_doubler, bool, 0);
+MODULE_PARM_DESC(doubler, "enable support for IDE doublers");
 #endif /* CONFIG_BLK_DEV_IDEDOUBLER */