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

-1
-1
drivers/ata/pata_jmicron.c
··· 244 { 245 pci_unregister_driver(&jmicron_pci_driver); 246 } 247 - #endif 248 249 module_init(jmicron_init); 250 module_exit(jmicron_exit);
··· 244 { 245 pci_unregister_driver(&jmicron_pci_driver); 246 } 247 248 module_init(jmicron_init); 249 module_exit(jmicron_exit);