diff options
| author | Alex Wiggins | 2016-06-15 06:55:22 +0100 |
|---|---|---|
| committer | Alex Wiggins | 2016-06-15 06:55:22 +0100 |
| commit | 7ba3b086987376a0689b36a120436cbc3dfa840b (patch) | |
| tree | 05fe5088428d243a4e914ab2758a3d3f996c1f62 /linux-4.6.patch | |
| parent | 5b7f8d0f621dd2c007b4832bbf7cdcf69c463ba5 (diff) | |
| download | aur-7ba3b086987376a0689b36a120436cbc3dfa840b.tar.gz | |
Clean up patch allowing compilation with kernel 4.6
Diffstat (limited to 'linux-4.6.patch')
| -rw-r--r-- | linux-4.6.patch | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/linux-4.6.patch b/linux-4.6.patch index 703b9e2edf29..1651fc291b47 100644 --- a/linux-4.6.patch +++ b/linux-4.6.patch @@ -1,5 +1,5 @@ --- setup/Linux/oss/build/pci_wrapper.inc 2014-08-31 19:40:14.000000000 +0100 -+++ setup/Linux/oss/build/pci_wrapper.inc 2016-06-14 23:50:17.138446865 +0100 ++++ setup/Linux/oss/build/pci_wrapper.inc 2016-06-15 06:51:46.402770996 +0100 @@ -71,8 +71,10 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) @@ -12,3 +12,23 @@ #endif osspci_remove (struct pci_dev *pcidev) { +@@ -88,11 +90,19 @@ + pci_disable_device (dev_map[i].pcidev); + osdev_delete (osdev); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0) + return 0; ++#else ++ return; ++#endif + } + + printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n"); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0) + return -EIO; ++#else ++ return; ++#endif + } + + void |