Commit 70077f2f authored by Linus Torvalds's avatar Linus Torvalds

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
parents 85a5d77a 527e1e18
...@@ -244,7 +244,6 @@ static void __exit jmicron_exit(void) ...@@ -244,7 +244,6 @@ static void __exit jmicron_exit(void)
{ {
pci_unregister_driver(&jmicron_pci_driver); pci_unregister_driver(&jmicron_pci_driver);
} }
#endif
module_init(jmicron_init); module_init(jmicron_init);
module_exit(jmicron_exit); module_exit(jmicron_exit);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment