aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/100-compat-add-missing-include-in-else-for-compat-3.10.h.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/mac80211/patches/100-compat-add-missing-include-in-else-for-compat-3.10.h.patch')
-rw-r--r--package/mac80211/patches/100-compat-add-missing-include-in-else-for-compat-3.10.h.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/package/mac80211/patches/100-compat-add-missing-include-in-else-for-compat-3.10.h.patch b/package/mac80211/patches/100-compat-add-missing-include-in-else-for-compat-3.10.h.patch
new file mode 100644
index 0000000000..2e485ed28b
--- /dev/null
+++ b/package/mac80211/patches/100-compat-add-missing-include-in-else-for-compat-3.10.h.patch
@@ -0,0 +1,40 @@
+From 16f4984678b93c03fc3fe31ed7c2bda491574ea7 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Sat, 18 May 2013 02:05:30 +0200
+Subject: [PATCH 1/2] compat: add missing include in #else for compat-3.10.h
+
+When compiling against 3.10-rc1, the build fails as follows:
+
+ CC [M] compat/main.o
+In file included from include/linux/compat-2.6.h:75:0,
+ from <command-line>:0:
+include/linux/compat-3.10.h:91:52: warning: 'struct fb_info' declared inside parameter list [enabled by default]
+include/linux/compat-3.10.h:91:52: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
+include/linux/compat-3.10.h: In function 'backport_fb_enable_skip_vt_switch':
+include/linux/compat-3.10.h:93:6: error: dereferencing pointer to incomplete type
+
+Fix this adding the missing include to the else branch to stay true to
+the original commit, instead of pulling it out of the #if #else #endif
+block.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ include/linux/compat-3.10.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/linux/compat-3.10.h b/include/linux/compat-3.10.h
+index f972203..9d6e55c 100644
+--- a/include/linux/compat-3.10.h
++++ b/include/linux/compat-3.10.h
+@@ -87,6 +87,8 @@ static inline void fb_enable_skip_vt_switch(struct fb_info *info)
+ * clash on the backport for 3.12 as the routine would
+ * already be defined *but* we'd need it for 3.11.
+ */
++#include <linux/fb.h>
++
+ #define fb_enable_skip_vt_switch LINUX_BACKPORT(fb_enable_skip_vt_switch)
+ static inline void fb_enable_skip_vt_switch(struct fb_info *info)
+ {
+--
+1.7.10.4
+