[PATCH 1/2] compat: add missing include in #else for compat-3.10.h

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxx>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux