From 0dca48d4a634d64075cdf2ae247249a2b0a3ef60 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 10 Dec 2009 22:20:43 -0800 Subject: [PATCH] Rename compat.h to compat-2.6.h As include/linux/compat.h is already taken upstream. Signed-off-by: Luis R. Rodriguez --- Makefile | 6 +++--- include/linux/{compat.h => compat-2.6.h} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename include/linux/{compat.h => compat-2.6.h} (100%) diff --git a/Makefile b/Makefile index 0433a14d67a4..0d4bd66d6e30 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ ifneq ($(wildcard $(KLIB_BUILD)/Makefile),) COMPAT_LATEST_VERSION = 32 KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p') 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)) +$(foreach ver,$(COMPAT_VERSIONS),$(eval export CONFIG_COMPAT_KERNEL_$(ver)=y)) endif obj-y += compat/ @@ -23,7 +23,7 @@ obj-y += compat/ # This hack lets us put our include path first than the kernel's # when building our compat modules. Your own makefile would look # the same. -NOSTDINC_FLAGS := -I$(M)/include/ -include $(M)/include/linux/compat.h $(CFLAGS) +NOSTDINC_FLAGS := -I$(M)/include/ -include $(M)/include/linux/compat-2.6.h $(CFLAGS) modules: $(MAKE) -C $(KLIB_BUILD) M=$(PWD) modules @@ -35,4 +35,4 @@ clean: $(MAKE) -C $(KLIB_BUILD) M=$(PWD) clean all: modules -clean-files := Module.symvers modules.order Module.markers +clean-files := Module.symvers modules.order Module.markers compat/modules.order diff --git a/include/linux/compat.h b/include/linux/compat-2.6.h similarity index 100% rename from include/linux/compat.h rename to include/linux/compat-2.6.h -- 2.30.2