diff options
author | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-09-08 23:52:34 +0000 |
---|---|---|
committer | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-09-08 23:52:34 +0000 |
commit | 6a4079a94ff01d8317392043ae17726cd7929aaf (patch) | |
tree | 58eafdd12797ac52a0dfc67c67312733c55be32d /wct4xxp | |
parent | 91e884835bf68a3c42304954c9bd3a748895bdf3 (diff) |
Merged revisions 1444 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1444 | file | 2006-09-08 19:49:43 -0400 (Fri, 08 Sep 2006) | 2 lines
Move CONFIG_FW_LOADER check to Makefile (reported internally by Spiceland)
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1445 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp')
-rw-r--r-- | wct4xxp/base.c | 4 |
1 files changed, 0 insertions, 4 deletions
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" |