diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 16:25:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 16:25:28 -0500 |
| commit | 70077f2fab35ed3d73631fc47d8c572b560ecabd (patch) | |
| tree | 1e979a5eb60c7063e3bc99f7a762f4cdb0ab4203 | |
| parent | 85a5d77abea94c3496f63dc3ba72f5f932daa799 (diff) | |
| parent | 527e1e1879cb10958b7ad4e04b3877abf54df3bd (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] pata_jmicron: build fix
| -rw-r--r-- | drivers/ata/pata_jmicron.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c index 033319e8b6cf..43763c99ea02 100644 --- a/drivers/ata/pata_jmicron.c +++ b/drivers/ata/pata_jmicron.c | |||
| @@ -244,7 +244,6 @@ static void __exit jmicron_exit(void) | |||
| 244 | { | 244 | { |
| 245 | pci_unregister_driver(&jmicron_pci_driver); | 245 | pci_unregister_driver(&jmicron_pci_driver); |
| 246 | } | 246 | } |
| 247 | #endif | ||
| 248 | 247 | ||
| 249 | module_init(jmicron_init); | 248 | module_init(jmicron_init); |
| 250 | module_exit(jmicron_exit); | 249 | module_exit(jmicron_exit); |