Merge lp:~blake-rouse/opencompute/mei-dkms into lp:opencompute/mei

[Blake Rouse]

Fix for building module on trusty.

Fix for building module on trusty.

[lp:~blake-rouse/opencompute/mei-dkms]

5. By Blake Rouse on 2014-03-05

Added backward support for precise and quantal, also now support saucy.

[Jeff Lane  (bladernr)]

Hi Blake,

Thanks for submitting this... looks good to me.

review: Approve

=== modified file 'mei-7.1.21.4.S/dkms.conf'
--- mei-7.1.21.4.S/dkms.conf	2013-08-04 01:44:16 +0000
+++ mei-7.1.21.4.S/dkms.conf	2014-03-05 15:24:07 +0000
@@ -6,5 +6,5 @@
 MAKE="make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules"
 CLEAN="make -C clean"
 AUTOINSTALL=yes
-BUILD_EXCLUSIVE_KERNEL="3.(2|5).*"
+BUILD_EXCLUSIVE_KERNEL="3.(2|5|11|13).*"
 REMAKE_INITRD=yes

=== modified file 'mei-7.1.21.4.S/main.c'
--- mei-7.1.21.4.S/main.c	2013-08-04 01:44:16 +0000
+++ mei-7.1.21.4.S/main.c	2014-03-05 15:24:07 +0000
@@ -50,6 +50,13 @@
 #define MEI_DRIVER_NAME	"mei"
 #define MEI_DEV_NAME "mei"
 
+/* fix for linux >= 3.8 */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+#define __devinit
+#define __devexit
+#define __devexit_p(x) x
+#endif
+
 /*
  *  mei driver strings
  */
@@ -120,7 +127,7 @@
  * returns 0 on success, <0 on failure.
  */
 static int __devinit mei_probe(struct pci_dev *pdev,
-				const struct pci_device_id *ent)
+	                       const struct pci_device_id *ent)
 {
 	struct mei_device *dev;
 	int err;