diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 22:25:28 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 22:25:28 +0100 |
| commit | 70077f2fab35ed3d73631fc47d8c572b560ecabd (patch) | |
| tree | 1e979a5eb60c7063e3bc99f7a762f4cdb0ab4203 | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
| parent | [libata] pata_jmicron: build fix (diff) | |
| download | linux-70077f2fab35ed3d73631fc47d8c572b560ecabd.tar.xz linux-70077f2fab35ed3d73631fc47d8c572b560ecabd.zip | |
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) { pci_unregister_driver(&jmicron_pci_driver); } -#endif module_init(jmicron_init); module_exit(jmicron_exit); |