diff options
| author | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-19 13:50:58 +0000 |
|---|---|---|
| committer | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-19 13:50:58 +0000 |
| commit | 76cbb5a1c3a55305412fd820981bd54339af9358 (patch) | |
| tree | 6eed5158c96e3139441eb422b97a317b77d2257e | |
| parent | 1e361139f997d23cf7b6b425603be7050e02a27f (diff) | |
Only use hotplug firmware loading if the kernel has support for it
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1243 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -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" |