diff --git a/[refs] b/[refs]
index 02e36ce94e16..c94605229918 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0763446429e46fd973f507f79900b95eb8aae2e4
+refs/heads/master: 2952755ce364b81f904b49397f6b0004dead2c9f
diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c
index 4a8952a6c3da..477833f0daf5 100644
--- a/trunk/drivers/ide/ide.c
+++ b/trunk/drivers/ide/ide.c
@@ -1229,7 +1229,7 @@ static int __init ide_setup(char *s)
 	if (!strcmp(s, "ide=reverse")) {
 		ide_scan_direction = 1;
 		printk(" : Enabled support for IDE inverse scan order.\n");
-		return 1;
+		goto obsolete_option;
 	}
 #endif