linamh/app-emulation/opencbm/files/0.4.3_rc2/00_autoconf-2.6.33.diff

37 lines
1020 B
Diff
Raw Normal View History

From: Frédéric Brière <fbriere@fbriere.net>
Subject: [PATCH] Adjusted autoconf.h location for Linux 2.6.33
Linux 2.6.33 has moved linux/autoconf.h to generated/autoconf.h.
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
Forwarded: yes
---
sys/linux/cbm_module.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
index d8c5a23..91ea8f3 100644
--- a/sys/linux/cbm_module.c
+++ b/sys/linux/cbm_module.c
@@ -22,12 +22,15 @@ static char *rcsid =
"@(#) $Id: cbm_module.c,v 1.13.2.21 2009/12/13 20:40:32 strik Exp $";
#endif
+#include <linux/version.h>
+
#ifdef KERNEL_INCLUDE_OLD_CONFIG_H
#include <linux/config.h>
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
#include <linux/autoconf.h>
+#else
+ #include <generated/autoconf.h>
#endif
-#include <linux/version.h>
#ifdef CONFIG_MODVERSIONS
# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4)
--
tg: (95e2d72..) fixes/autoconf-2.6.33 (depends on: upstream)