From cd52397e850829a1de52c10735e31a25b159bd5d Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 25 Aug 2010 16:48:28 -0700 Subject: [PATCH] compat-wireless: fix unintended merge of changes Signed-off-by: Luis R. Rodriguez --- config.mk | 4 ++-- scripts/gen-compat-autoconf.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.mk b/config.mk index 0d951d16fae9..edfeca262559 100644 --- a/config.mk +++ b/config.mk @@ -25,8 +25,8 @@ KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2 COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done) $(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_$(ver)=y)) -ifdef CONFIG_COMPAT_WIRELESS_23 -$(error "ERROR: compat-wireless for selected driver requires a kernel >= 2.6.23") +ifdef CONFIG_COMPAT_KERNEL_25 +$(error "ERROR: compat-wireless by default supports kernels >= 2.6.25, try enabling only one driver though") endif ifeq ($(CONFIG_CFG80211),y) diff --git a/scripts/gen-compat-autoconf.sh b/scripts/gen-compat-autoconf.sh index 64dac69f6926..1e3002e8f511 100755 --- a/scripts/gen-compat-autoconf.sh +++ b/scripts/gen-compat-autoconf.sh @@ -11,7 +11,7 @@ # This indicates which is the oldest kernel we support # Update this if you are adding support for older kernels. -OLDEST_KERNEL_SUPPORTED="2.6.23" +OLDEST_KERNEL_SUPPORTED="2.6.25" COMPAT_RELEASE="compat_version" KERNEL_RELEASE="compat_base_tree_version" MULT_DEP_FILE=".compat_pivot_dep" -- 2.30.2