diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | wct4xxp_base.c | 4 |
2 files changed, 5 insertions, 4 deletions
@@ -87,9 +87,6 @@ endif ifeq ($(HOTPLUG_FIRMWARE),yes) CFLAGS+=-DHOTPLUG_FIRMWARE - VPM450M_FIRMWARE_HEADER= -else - VPM450M_FIRMWARE_HEADER=vpm450m_fw.h endif # CVS mirrors of SVN have .svnrevision files showing @@ -144,7 +141,7 @@ all: $(BUILDVER) $(LIBTONEZONE_SO) linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS) -linux26: prereq $(VPM450M_FIRMWARE_HEADER) $(BINS) +linux26: prereq vpm450m_fw.h $(BINS) @echo $(KSRC) @if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi $(KMAKE) modules diff --git a/wct4xxp_base.c b/wct4xxp_base.c index bfa356f..be23bcb 100644 --- a/wct4xxp_base.c +++ b/wct4xxp_base.c @@ -41,9 +41,13 @@ #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" |