mac80211: make it build with 3.10-rc1
[openwrt/staging/chunkeey.git] / package / mac80211 / patches / 100-compat-add-missing-include-in-else-for-compat-3.10.h.patch
1 From 16f4984678b93c03fc3fe31ed7c2bda491574ea7 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Sat, 18 May 2013 02:05:30 +0200
4 Subject: [PATCH 1/2] compat: add missing include in #else for compat-3.10.h
5
6 When compiling against 3.10-rc1, the build fails as follows:
7
8 CC [M] compat/main.o
9 In file included from include/linux/compat-2.6.h:75:0,
10 from <command-line>:0:
11 include/linux/compat-3.10.h:91:52: warning: 'struct fb_info' declared inside parameter list [enabled by default]
12 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]
13 include/linux/compat-3.10.h: In function 'backport_fb_enable_skip_vt_switch':
14 include/linux/compat-3.10.h:93:6: error: dereferencing pointer to incomplete type
15
16 Fix this adding the missing include to the else branch to stay true to
17 the original commit, instead of pulling it out of the #if #else #endif
18 block.
19
20 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
21 ---
22 include/linux/compat-3.10.h | 2 ++
23 1 file changed, 2 insertions(+)
24
25 diff --git a/include/linux/compat-3.10.h b/include/linux/compat-3.10.h
26 index f972203..9d6e55c 100644
27 --- a/include/linux/compat-3.10.h
28 +++ b/include/linux/compat-3.10.h
29 @@ -87,6 +87,8 @@ static inline void fb_enable_skip_vt_switch(struct fb_info *info)
30 * clash on the backport for 3.12 as the routine would
31 * already be defined *but* we'd need it for 3.11.
32 */
33 +#include <linux/fb.h>
34 +
35 #define fb_enable_skip_vt_switch LINUX_BACKPORT(fb_enable_skip_vt_switch)
36 static inline void fb_enable_skip_vt_switch(struct fb_info *info)
37 {
38 --
39 1.7.10.4
40