[packages/kernel/LINUX_3_18] - fix building with gcc 6 - rel 2

[baggins]

commit 31c03e2d636bc12e9e821ca99fafc7d342a1f57c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jan 21 13:56:20 2017 +0100

    - fix building with gcc 6
    - rel 2

 kernel-small_fixes.patch | 26 ++++++++++++++++++++++++++
 kernel.spec              |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/kernel.spec b/kernel.spec
index 4a363ca..95580f0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
+%define		rel		2
 %define		basever		3.18
 %define		postver		.47
 
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 12c7335..a5580dd 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -62,3 +62,29 @@
  {
  	int err;
  
+--- a/include/linux/mod_devicetable.h	2014-12-07 23:21:05.000000000 +0100
++++ b/include/linux/mod_devicetable.h	2016-05-17 19:13:57.872493187 +0200
+@@ -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;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/31c03e2d636bc12e9e821ca99fafc7d342a1f57c