From 3f130994178234860910abc43cac9bc809dddfe5 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 24 May 2012 15:29:28 +0200 Subject: [PATCH] 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 Signed-off-by: Luis R. Rodriguez --- compat/Makefile | 2 +- compat/{compat-3.5.c => compat-3.4.c} | 0 include/linux/compat-3.4.h | 2 ++ include/linux/compat-3.5.h | 2 -- 4 files changed, 3 insertions(+), 3 deletions(-) rename compat/{compat-3.5.c => compat-3.4.c} (100%) diff --git a/compat/Makefile b/compat/Makefile index bda677b..667e727 100644 --- 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.5.c b/compat/compat-3.4.c similarity index 100% rename from compat/compat-3.5.c rename to compat/compat-3.4.c diff --git a/include/linux/compat-3.4.h b/include/linux/compat-3.4.h index 1b72374..f343795 100644 --- a/include/linux/compat-3.4.h +++ b/include/linux/compat-3.4.h @@ -8,6 +8,8 @@ #include #include +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 c837deb..0bb35bb 100644 --- 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() -- 2.41.0