diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 18:53:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 18:53:10 -0500 |
| commit | e2e29831cc463f4be61d4e36b8699ae7e071a685 (patch) | |
| tree | d5c40f6a328e07edb2db7186bef3a6c932c404fb /drivers/ide/alim15x3.c | |
| parent | 9a689bc4f09f8b89f88e65b1b0a2ea780b4f28de (diff) | |
| parent | 95964018d53f479529dfdc2b46fe30c0a14a00e0 (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:
alim15x3: fix sparse warning
ide: remove dead code from drive_is_ready()
ide: fix build for DEBUG_PM
ide: respect current DMA setting during resume
ide: add SAMSUNG SP0822N with firmware WA100-10 to ivb_list[]
amd74xx: workaround unreliable AltStatus register for nVidia controllers
ide: fix the ide_release_lock imbalance
Diffstat (limited to 'drivers/ide/alim15x3.c')
| -rw-r--r-- | drivers/ide/alim15x3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c index e56c7b72f9e2..45d2356bb725 100644 --- a/drivers/ide/alim15x3.c +++ b/drivers/ide/alim15x3.c | |||
| @@ -591,7 +591,7 @@ static int __init ali15x3_ide_init(void) | |||
| 591 | 591 | ||
| 592 | static void __exit ali15x3_ide_exit(void) | 592 | static void __exit ali15x3_ide_exit(void) |
| 593 | { | 593 | { |
| 594 | return pci_unregister_driver(&alim15x3_pci_driver); | 594 | pci_unregister_driver(&alim15x3_pci_driver); |
| 595 | } | 595 | } |
| 596 | 596 | ||
| 597 | module_init(ali15x3_ide_init); | 597 | module_init(ali15x3_ide_init); |