From 48cbde1b140d7b8709a040047ece3ceaea1c8049 Mon Sep 17 00:00:00 2001
From: Denis Cheng <crquan@gmail.com>
Date: Wed, 6 Feb 2008 02:57:49 +0100
Subject: [PATCH] --- yaml --- r: 83343 b: refs/heads/master c:
 594765a7316562cb7442f760a9a2f6e02804b610 h: refs/heads/master i:   83341:
 8c3f67a65380d5e7a81973d79b823d85e95d6daa   83339:
 e382d8ba9ae16a6e166c344a6d04d75a2114448c   83335:
 6254e7a4d70f06a2cd707427423bdeff96a5552b   83327:
 e1a0a8d7d62a69bc7e18c9a05881f9058cfdd33d v: v3

---
 [refs]                                    |  2 +-
 trunk/Documentation/kernel-parameters.txt |  3 +++
 trunk/drivers/ide/pci/Makefile            |  3 ++-
 trunk/drivers/ide/pci/generic.c           | 13 -------------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 0b21594e5a4b..3d153a6915a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b004223db7249d42db893df916457acecc22759c
+refs/heads/master: 594765a7316562cb7442f760a9a2f6e02804b610
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 9ad4e6fc56fd..8fd5aa40585f 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -780,6 +780,9 @@ and is between 256 and 4096 characters. It is defined in the file
 			loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same
 			as idle=poll.
 
+	ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem
+			Claim all unknown PCI IDE storage controllers.
+
 	ignore_loglevel	[KNL]
 			Ignore loglevel setting - this will print /all/
 			kernel messages to the console. Useful for debugging.
diff --git a/trunk/drivers/ide/pci/Makefile b/trunk/drivers/ide/pci/Makefile
index 94803253e8af..02e6ee7d751d 100644
--- a/trunk/drivers/ide/pci/Makefile
+++ b/trunk/drivers/ide/pci/Makefile
@@ -34,7 +34,8 @@ obj-$(CONFIG_BLK_DEV_TRM290)		+= trm290.o
 obj-$(CONFIG_BLK_DEV_VIA82CXXX)		+= via82cxxx.o
 
 # Must appear at the end of the block
-obj-$(CONFIG_BLK_DEV_GENERIC)          += generic.o
+obj-$(CONFIG_BLK_DEV_GENERIC)		+= ide-pci-generic.o
+ide-pci-generic-y			+= generic.o
 
 ifeq ($(CONFIG_BLK_DEV_CMD640), m)
 	obj-m += cmd640.o
diff --git a/trunk/drivers/ide/pci/generic.c b/trunk/drivers/ide/pci/generic.c
index 9262a9174b4e..7fd83a9d4dee 100644
--- a/trunk/drivers/ide/pci/generic.c
+++ b/trunk/drivers/ide/pci/generic.c
@@ -29,19 +29,6 @@
 
 static int ide_generic_all;		/* Set to claim all devices */
 
-/*
- * the module_param_named() was added for the modular case
- * the __setup() is left as compatibility for existing setups
- */
-#ifndef MODULE
-static int __init ide_generic_all_on(char *unused)
-{
-	ide_generic_all = 1;
-	printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.\n");
-	return 1;
-}
-const __setup("all-generic-ide", ide_generic_all_on);
-#endif
 module_param_named(all_generic_ide, ide_generic_all, bool, 0444);
 MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");