diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 11:41:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 11:41:27 -0500 |
| commit | 597049ccd729e80c5eff7d907beeb58d908aac6f (patch) | |
| tree | 49e6ffd8838ed00923876fa3b1ed8a145444fd1a /drivers/ide/pci/sl82c105.c | |
| parent | d3143e71a95fe504c3d2d4a3b7aac126a588b1ac (diff) | |
| parent | e0b874df14052489e6408125903dba96b4dd7baa (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
via82cxxx/pata_via: correct PCI_DEVICE_ID_VIA_SATA_EIDE ID and add support for CX700 and 8237S
ide: unregister idepnp driver on unload
ide: add missing __init tags to IDE PCI host drivers
ia64: add pci_get_legacy_ide_irq()
ide/generic: Jmicron has its own drivers now
atiixp.c: add cable detection support for ATI IDE
atiixp.c: sb600 ide only has one channel
atiixp.c: remove unused code
jmicron: fix warning
ide: update MAINTAINERS entry
Diffstat (limited to 'drivers/ide/pci/sl82c105.c')
| -rw-r--r-- | drivers/ide/pci/sl82c105.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index 5afefe8692fe..170a26199050 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c | |||
| @@ -492,7 +492,7 @@ static struct pci_driver driver = { | |||
| 492 | .probe = sl82c105_init_one, | 492 | .probe = sl82c105_init_one, |
| 493 | }; | 493 | }; |
| 494 | 494 | ||
| 495 | static int sl82c105_ide_init(void) | 495 | static int __init sl82c105_ide_init(void) |
| 496 | { | 496 | { |
| 497 | return ide_pci_register_driver(&driver); | 497 | return ide_pci_register_driver(&driver); |
| 498 | } | 498 | } |