From c5411288c176ae04b05f4f2c8b87de10486dd2c8 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 28 Mar 2006 01:56:32 -0800
Subject: [PATCH] --- yaml --- r: 24475 b: refs/heads/master c:
 b02389e98a7b64ad5cd4823740defa8821f30bbd h: refs/heads/master i:   24473:
 31716375958c3f15a38fbce6aa858543a10e30e2   24471:
 4aa963dad6a448ceffe7b34315315f7a999cd472 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ide/pci/generic.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c77560bc6cc1..19a69df365a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d266ab88938e49aa95f1965ee020df1b1d4c5761
+refs/heads/master: b02389e98a7b64ad5cd4823740defa8821f30bbd
diff --git a/trunk/drivers/ide/pci/generic.c b/trunk/drivers/ide/pci/generic.c
index 6e3ab0c38c4d..f82e82109728 100644
--- a/trunk/drivers/ide/pci/generic.c
+++ b/trunk/drivers/ide/pci/generic.c
@@ -41,14 +41,15 @@
 
 static int ide_generic_all;		/* Set to claim all devices */
 
+#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;
 }
-
 __setup("all-generic-ide", ide_generic_all_on);
+#endif
 
 static void __devinit init_hwif_generic (ide_hwif_t *hwif)
 {