diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-28 15:03:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-28 15:03:14 -0400 |
| commit | 2a397e82c7db18019e408f953dd58dc1963a328c (patch) | |
| tree | 43ccaec68cc3aa1b3903e2b4c970d31b8737d4ed /drivers/ide/pci/generic.c | |
| parent | ea45d15394c57cb214aef8e6d40976c128995d43 (diff) | |
| parent | 8588a2b732928b343233af9b1855705b8286bed4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: add SH-S202J to ivb_list[]
drivers/ide/pci/sc1200.c: fix suspend/resume buglets and warnings
drivers/ide/pci/generic: fix build for CONFIG_HOTPLUG=n
hpt366: fix build for CONFIG_HOTPLUG=n
cy82c693: fix build for CONFIG_HOTPLUG=n
Diffstat (limited to 'drivers/ide/pci/generic.c')
| -rw-r--r-- | drivers/ide/pci/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c index f44d70852c3c..06885697ed7b 100644 --- a/drivers/ide/pci/generic.c +++ b/drivers/ide/pci/generic.c | |||
| @@ -49,7 +49,7 @@ static int __init ide_generic_all_on(char *unused) | |||
| 49 | printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.\n"); | 49 | printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.\n"); |
| 50 | return 1; | 50 | return 1; |
| 51 | } | 51 | } |
| 52 | __setup("all-generic-ide", ide_generic_all_on); | 52 | const __setup("all-generic-ide", ide_generic_all_on); |
| 53 | #endif | 53 | #endif |
| 54 | module_param_named(all_generic_ide, ide_generic_all, bool, 0444); | 54 | module_param_named(all_generic_ide, ide_generic_all, bool, 0444); |
| 55 | MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers."); | 55 | MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers."); |