summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--wct4xxp/base.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c247be5..da32f17 100644
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,7 @@ MODULESO:=$(MODULES:%=%.o)
MODULESKO:=$(MODULES:%=%.ko)
ifeq ($(BUILDVER),linux26)
MODULES_BUILD:=$(MODULESKO)
-HOTPLUG_FIRMWARE:=yes
+HOTPLUG_FIRMWARE:=$(shell if grep CONFIG_FW_LOADER $(KINCLUDES)/linux/autoconf.h | grep -q undef; then echo "no"; else echo "yes"; fi)
else
MODULES_BUILD:=$(MODULESO)
endif
diff --git a/wct4xxp/base.c b/wct4xxp/base.c
index b6c56ab..b26307e 100644
--- a/wct4xxp/base.c
+++ b/wct4xxp/base.c
@@ -43,13 +43,9 @@
#ifdef LINUX26
#include <linux/moduleparam.h>
#ifdef HOTPLUG_FIRMWARE
-#ifndef CONFIG_FW_LOADER
-#undef HOTPLUG_FIRMWARE
-#else
#include <linux/firmware.h>
#endif
#endif
-#endif
#include "wct4xxp.h"
#include "vpm450m.h"