aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-08-01 21:14:15 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-08-01 21:14:15 +0000
commite79f073de9274053aad1e463f3bd5843c7ef765e (patch)
tree76c7c0e6d6e435bbca796f37fe6bc9f360bedf3a
parentfbb4f376335d58bad009828513b28d1c0a70ec48 (diff)
downloadupstream-e79f073de9274053aad1e463f3bd5843c7ef765e.tar.gz
upstream-e79f073de9274053aad1e463f3bd5843c7ef765e.tar.bz2
upstream-e79f073de9274053aad1e463f3bd5843c7ef765e.zip
mac80211: fix a compiler warning
SVN-Revision: 27870
-rw-r--r--package/mac80211/patches/050-compat_firmware.patch9
1 files changed, 6 insertions, 3 deletions
diff --git a/package/mac80211/patches/050-compat_firmware.patch b/package/mac80211/patches/050-compat_firmware.patch
index 0fcee76317..f4cc27d405 100644
--- a/package/mac80211/patches/050-compat_firmware.patch
+++ b/package/mac80211/patches/050-compat_firmware.patch
@@ -41,7 +41,7 @@
EXPORT_SYMBOL(request_firmware_nowait);
--- a/compat/main.c
+++ b/compat/main.c
-@@ -32,6 +32,14 @@ module_param(compat_version, charp, 0400
+@@ -32,6 +32,17 @@ module_param(compat_version, charp, 0400
MODULE_PARM_DESC(compat_version,
"Version of the kernel compat backport work");
@@ -49,14 +49,17 @@
+int __init firmware_class_init(void);
+void __exit firmware_class_exit(void);
+#else
-+static inline int firmware_class_init(void) {}
++static inline int firmware_class_init(void)
++{
++ return 0;
++}
+static inline void firmware_class_exit(void) {}
+#endif
+
static int __init compat_init(void)
{
/* pm-qos for kernels <= 2.6.24, this is a no-op on newer kernels */
-@@ -45,15 +53,15 @@ static int __init compat_init(void)
+@@ -45,15 +56,15 @@ static int __init compat_init(void)
COMPAT_BASE_TREE " " COMPAT_BASE_TREE_VERSION
"\n");