diff --git a/srcpkgs/linux3.18/patches/gcc6-fix-mod_devicetable.patch b/srcpkgs/linux3.18/patches/gcc6-fix-mod_devicetable.patch
new file mode 100644
index 00000000000..474270adb10
--- /dev/null
+++ b/srcpkgs/linux3.18/patches/gcc6-fix-mod_devicetable.patch
@@ -0,0 +1,27 @@
+diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
+--- a/include/linux/mod_devicetable.h
++++ b/include/linux/mod_devicetable.h
+@@ -398,6 +398,7 @@ struct virtio_device_id {
+ /*
+  * For Hyper-V devices we use the device guid as the id.
+  */
++#define vmbus_device_id hv_vmbus_device_id
+ struct hv_vmbus_device_id {
+ 	__u8 guid[16];
+ 	kernel_ulong_t driver_data;	/* Data private to the driver */
+@@ -597,6 +598,7 @@ struct ipack_device_id {
+ #define MEI_CL_MODULE_PREFIX "mei:"
+ #define MEI_CL_NAME_SIZE 32
+ 
++#define mei_device_id mei_cl_device_id
+ struct mei_cl_device_id {
+ 	char name[MEI_CL_NAME_SIZE];
+ 	kernel_ulong_t driver_info;
+@@ -616,6 +618,7 @@ struct mei_cl_device_id {
+  * Identifies a RapidIO device based on both the device/vendor IDs and
+  * the assembly device/vendor IDs.
+  */
++#define rapidio_device_id rio_device_id
+ struct rio_device_id {
+ 	__u16 did, vid;
+ 	__u16 asm_did, asm_vid;
diff --git a/srcpkgs/linux3.18/template b/srcpkgs/linux3.18/template
index 2bb1f51e480..20d27264369 100644
--- a/srcpkgs/linux3.18/template
+++ b/srcpkgs/linux3.18/template
@@ -2,6 +2,7 @@
 pkgname=linux3.18
 version=3.18.46
 revision=1
+patch_args="-Np1"
 wrksrc="linux-${version}"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.kernel.org"
@@ -10,7 +11,6 @@ short_desc="The Linux kernel and modules (${version%.*} series)"
 distfiles="${KERNEL_SITE}/kernel/v3.x/linux-${version}.tar.xz"
 checksum=cb404757b727faceae9fe1a436ef0cd12d37d54c67df4814f36b00c4bad17b4a
 
-broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/182/steps/shell_3/logs/stdio"
 _kernver="${version}_${revision}"
 
 nostrip=yes