mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge commit 'origin/master' into next
This commit is contained in:
commit
7dafd239ab
2130 changed files with 173089 additions and 37559 deletions
|
|
@ -679,7 +679,7 @@ alloc_err:
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int sn_pci_hotplug_init(void)
|
||||
static int __init sn_pci_hotplug_init(void)
|
||||
{
|
||||
struct pci_bus *pci_bus = NULL;
|
||||
int rc;
|
||||
|
|
@ -716,7 +716,7 @@ static int sn_pci_hotplug_init(void)
|
|||
return registered == 1 ? 0 : -ENODEV;
|
||||
}
|
||||
|
||||
static void sn_pci_hotplug_exit(void)
|
||||
static void __exit sn_pci_hotplug_exit(void)
|
||||
{
|
||||
struct hotplug_slot *bss_hotplug_slot;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue