Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -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);