Return-path: Received: from nbd.name ([46.4.11.11]:41610 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752481Ab2EXN3b (ORCPT ); Thu, 24 May 2012 09:29:31 -0400 From: Felix Fietkau To: linux-wireless@vger.kernel.org Cc: mcgrof@qca.qualcomm.com Subject: [PATCH] compat: rename compat-3.5.c to compat-3.4.c Date: Thu, 24 May 2012 15:29:28 +0200 Message-Id: <1337866168-11749-1-git-send-email-nbd@openwrt.org> (sfid-20120524_152935_281510_44708CFF) Sender: linux-wireless-owner@vger.kernel.org List-ID: It only contains simple_open, which is already available on Linux 3.4. Fixes duplicate symbol issues on 3.4 Signed-off-by: Felix Fietkau --- compat/Makefile | 2 +- compat/compat-3.4.c | 20 ++++++++++++++++++++ compat/compat-3.5.c | 20 -------------------- 3 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 compat/compat-3.4.c delete mode 100644 compat/compat-3.5.c 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.4.c b/compat/compat-3.4.c new file mode 100644 index 0000000..5d516f0 --- /dev/null +++ b/compat/compat-3.4.c @@ -0,0 +1,20 @@ +/* + * Copyright 2012 Luis R. Rodriguez + * + * 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 +#include + +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 index 5d516f0..0000000 --- a/compat/compat-3.5.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012 Luis R. Rodriguez - * - * 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 -#include - -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); -- 1.7.3.2