From 4f11b98f20455f018a7d8d211607b548c7ff7e38 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 24 Feb 2012 17:23:53 -0800 Subject: [PATCH] compat-wireless: fix old checks on KERNEL_SUBLEVEL KERNEL_SUBLEVEL used to be used on config.mk for th 2.6.x series but after 3.x support was added the variable should have been changed to KERNEL_26SUBLEVEL. Signed-off-by: Luis R. Rodriguez --- config.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index f8a4ca5a92fa..4b473211b78e 100644 --- a/config.mk +++ b/config.mk @@ -53,7 +53,8 @@ endif # 2.6.27 has FTRACE_DYNAMIC borked, so we will complain if # you have it enabled, otherwise you will very likely run into # a kernel panic. -ifeq ($(shell test $(KERNEL_VERSION) -eq 2 -a $(KERNEL_SUBLEVEL) -eq 27 && echo yes),yes) +# XXX: move this to compat_autoconf.h script generation +ifeq ($(shell test $(KERNEL_VERSION) -eq 2 -a $(KERNEL_26SUBLEVEL) -eq 27 && echo yes),yes) ifeq ($(CONFIG_DYNAMIC_FTRACE),y) $(error "ERROR: Your 2.6.27 kernel has CONFIG_DYNAMIC_FTRACE, please upgrade your distribution kernel as newer ones should not have this enabled (and if so report a bug) or remove this warning if you know what you are doing") endif @@ -70,7 +71,8 @@ endif # # In kernel 2.6.32 both attributes were removed. # -ifeq ($(shell test $(KERNEL_VERSION) -eq 2 -a $(KERNEL_SUBLEVEL) -ge 27 -a $(KERNEL_SUBLEVEL) -le 31 && echo yes),yes) +# XXX: move this to compat_autoconf.h script generation +ifeq ($(shell test $(KERNEL_VERSION) -eq 2 -a $(KERNEL_26SUBLEVEL) -ge 27 -a $(KERNEL_26SUBLEVEL) -le 31 && echo yes),yes) ifeq ($(CONFIG_MAC80211),) $(error "ERROR: Your >=2.6.27 and <= 2.6.31 kernel has CONFIG_MAC80211 disabled, you should have it CONFIG_MAC80211=m if you want to use this thing.") endif -- 2.30.2