The patch titled drivers/ide/pci/generic.c: re-add the __setup("all-generic-ide",...) has been removed from the -mm tree. Its filename was drivers-ide-pci-genericc-re-add-the-__setupall-generic-ide.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: drivers/ide/pci/generic.c: re-add the __setup("all-generic-ide",...) From: Adrian Bunk <bunk@xxxxxxxxx> The change from __setup() to module_param_named() requires users to prefix the option with "generic.". This patch re-adds the __setup() additionally to the module_param_named(). Usually it would make sense getting rid of such an obsolete __setup() at some time, but considering that drivers/ide/ is slowly approaching a RIP status it's already implicitely scheduled for removal. This patch fixes kernel Bugzilla #7353. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/ide/pci/generic.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff -puN drivers/ide/pci/generic.c~drivers-ide-pci-genericc-re-add-the-__setupall-generic-ide drivers/ide/pci/generic.c --- a/drivers/ide/pci/generic.c~drivers-ide-pci-genericc-re-add-the-__setupall-generic-ide +++ a/drivers/ide/pci/generic.c @@ -40,6 +40,19 @@ 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."); + return 1; +} +__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."); _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch git-mtd.patch git-pcmcia.patch drivers-scsi-small-cleanups.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-advansysc-cleanups.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-dpt_i2oc-remove-dead-code.patch acx1xx-wireless-driver.patch drivers-edac-make-code-static.patch fs-reiser4-possible-cleanups.patch reiser4-possible-cleanups-2.patch slab-cache-shrinker-statistics.patch debug-shared-irqs-kconfig-fix.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html