compat: rename compat-3.5.c to compat-3.4.c

It only contains simple_open, which is already available on Linux 3.4.
Fixes duplicate symbol issues on 3.4

mcgrof@tux ~/compat (git::master)$ ckmake
Trying kernel                  3.4.0-030400rc1-generic  [OK]
Trying kernel                     3.3.7-030307-generic  [OK]
Trying kernel                     3.2.2-030202-generic  [OK]
Trying kernel                    3.1.10-030110-generic  [OK]
Trying kernel                    3.0.18-030018-generic  [OK]
Trying kernel                  2.6.39-02063904-generic  [OK]
Trying kernel                  2.6.38-02063808-generic  [OK]
Trying kernel                  2.6.37-02063706-generic  [OK]
Trying kernel                  2.6.36-02063604-generic  [OK]
Trying kernel                  2.6.35-02063512-generic  [OK]
Trying kernel                  2.6.34-02063410-generic  [OK]
Trying kernel                  2.6.33-02063305-generic  [OK]
Trying kernel                  2.6.32-02063255-generic  [OK]
Trying kernel                  2.6.31-02063113-generic  [OK]
Trying kernel                  2.6.30-02063010-generic  [OK]
Trying kernel                  2.6.29-02062906-generic  [OK]
Trying kernel                  2.6.28-02062810-generic  [OK]
Trying kernel                    2.6.27-020627-generic  [OK]
Trying kernel                    2.6.26-020626-generic  [OK]
Trying kernel                    2.6.25-020625-generic  [OK]
Trying kernel                    2.6.24-020624-generic  [OK]

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>

diff --git a/compat/Makefile b/compat/Makefile
index bda677b636cd180c8e1f98e557c65092faa76c61..667e7276311040234bacbcca37cfd767c4354797 100644 (file)
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -37,7 +37,7 @@ compat-$(CONFIG_COMPAT_KERNEL_2_6_39) += \
 compat-$(CONFIG_COMPAT_KERNEL_3_0) += compat-3.0.o
 compat-$(CONFIG_COMPAT_KERNEL_3_2) += compat-3.2.o
 compat-$(CONFIG_COMPAT_KERNEL_3_3) += compat-3.3.o
-compat-$(CONFIG_COMPAT_KERNEL_3_5) += compat-3.5.o
+compat-$(CONFIG_COMPAT_KERNEL_3_4) += compat-3.4.o
 
 compat-$(CONFIG_COMPAT_CORDIC) += cordic.o
 compat-$(CONFIG_COMPAT_CRC8) += crc8.o

diff --git a/compat/compat-3.4.c b/compat/compat-3.4.c
new file mode 100644 (file)
index 0000000..5d516f0
--- /dev/null
+++ b/compat/compat-3.4.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012  Luis R. Rodriguez <mcgrof@frijolero.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Compatibility file for Linux wireless for kernels 3.5.
+ */
+
+#include <linux/fs.h>
+#include <linux/module.h>
+
+int simple_open(struct inode *inode, struct file *file)
+{
+       if (inode->i_private)
+               file->private_data = inode->i_private;
+       return 0;
+}
+EXPORT_SYMBOL_GPL(simple_open);

diff --git a/compat/compat-3.5.c b/compat/compat-3.5.c
deleted file mode 100644 (file)
index 5d516f0..0000000
--- a/compat/compat-3.5.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2012  Luis R. Rodriguez <mcgrof@frijolero.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Compatibility file for Linux wireless for kernels 3.5.
- */
-
-#include <linux/fs.h>
-#include <linux/module.h>
-
-int simple_open(struct inode *inode, struct file *file)
-{
-       if (inode->i_private)
-               file->private_data = inode->i_private;
-       return 0;
-}
-EXPORT_SYMBOL_GPL(simple_open);

diff --git a/include/linux/compat-3.4.h b/include/linux/compat-3.4.h
index 1b72374229373464b49f80e5c97dce085aef8c6d..f34379593145fb3c38645089eec0da9a276c20ac 100644 (file)
--- a/include/linux/compat-3.4.h
+++ b/include/linux/compat-3.4.h
@@ -8,6 +8,8 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 
+extern int simple_open(struct inode *inode, struct file *file);
+
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28))
 #define skb_add_rx_frag(skb, i, page, off, size, truesize) \
        v2_6_28_skb_add_rx_frag(skb, i, page, off, size)

diff --git a/include/linux/compat-3.5.h b/include/linux/compat-3.5.h
index c837deb3051fd4b525afbb5491074e1aa573dd82..0bb35bb58ea7e0b7117434583facd36642464a0f 100644 (file)
--- a/include/linux/compat-3.5.h
+++ b/include/linux/compat-3.5.h
@@ -8,8 +8,6 @@
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
 
-extern int simple_open(struct inode *inode, struct file *file);
-
 /* Backports tty_lock: Localise the lock */
 #define tty_lock(__tty) tty_lock()
 #define tty_unlock(__tty) tty_unlock()