diff -Nru oss4-4.2-build2010/debian/changelog oss4-4.2-build2010/debian/changelog
--- oss4-4.2-build2010/debian/changelog	2016-01-31 12:35:49.000000000 +0000
+++ oss4-4.2-build2010/debian/changelog	2016-07-05 16:54:55.000000000 +0000
@@ -1,3 +1,10 @@
+oss4 (4.2-build2010-5ubuntu1) yakkety; urgency=low
+
+  * d/p/osspci_remove-should-return-void.patch -- correct return from
+    struct pci_device remove callback.  (LP: #1599237)
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Tue, 05 Jul 2016 17:08:41 +0100
+
 oss4 (4.2-build2010-5) unstable; urgency=medium
 
   * rules: Don't install libasound.so.2 link in liboss4-salsa-dev...
diff -Nru oss4-4.2-build2010/debian/control oss4-4.2-build2010/debian/control
--- oss4-4.2-build2010/debian/control	2016-01-31 12:36:49.000000000 +0000
+++ oss4-4.2-build2010/debian/control	2016-07-05 16:55:01.000000000 +0000
@@ -1,7 +1,8 @@
 Source: oss4
 Section: sound
 Priority: optional
-Maintainer: Debian OSS4 Maintainers <pkg-oss4-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OSS4 Maintainers <pkg-oss4-maintainers@lists.alioth.debian.org>
 Uploaders: Sebastien NOEL <sebastien@twolife.org>,
            Romain Beauxis <toots@rastageeks.org>,
            Samuel Thibault <sthibault@debian.org>,
diff -Nru oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch
--- oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch	1970-01-01 00:00:00.000000000 +0000
+++ oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch	2016-07-05 16:08:34.000000000 +0000
@@ -0,0 +1,36 @@
+Description: osspci_remove should return void
+ The stuct pci_device callback remove should be a void function.  This
+ has been true since 2.6.12 but only recently has this become fatal.
+Author: Andy Whitcroft <apw@ubuntu.com>
+---
+
+Index: oss4-4.2-build2010/setup/Linux/oss/build/pci_wrapper.inc
+===================================================================
+--- oss4-4.2-build2010.orig/setup/Linux/oss/build/pci_wrapper.inc
++++ oss4-4.2-build2010/setup/Linux/oss/build/pci_wrapper.inc
+@@ -70,9 +70,9 @@ osspci_probe (struct pci_dev *pcidev, co
+ }
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+- static int __devexit
++ static void __devexit
+ #else
+- static int
++ static void
+ #endif
+ osspci_remove (struct pci_dev *pcidev)
+ {
+@@ -87,12 +87,10 @@ osspci_remove (struct pci_dev *pcidev)
+ 	  printk (KERN_ALERT DRIVER_NICK ": Unloading busy device\n");
+ 	pci_disable_device (dev_map[i].pcidev);
+ 	osdev_delete (osdev);
+-
+-	return 0;
++	return;
+       }
+ 
+   printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n");
+-  return -EIO;
+ }
+ 
+ void
diff -Nru oss4-4.2-build2010/debian/patches/series oss4-4.2-build2010/debian/patches/series
--- oss4-4.2-build2010/debian/patches/series	2015-09-25 23:31:01.000000000 +0000
+++ oss4-4.2-build2010/debian/patches/series	2016-07-05 16:06:41.000000000 +0000
@@ -19,3 +19,4 @@
 #generic_srccconf.patch (seems completely broken to me)
 501_linux_version.patch
 502_linux_io.patch
+osspci_remove-should-return-void.patch