diff options
author | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-19 13:53:35 +0000 |
---|---|---|
committer | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-19 13:53:35 +0000 |
commit | ee2a46a233b7fd88af35650a96dce4242a1061ec (patch) | |
tree | 4fddea0218f12a8e86bfa23e92a6916532888655 /wct4xxp_base.c | |
parent | 3a5bbe43a4d3838f1a550534472aec043dc2b936 (diff) |
Merged revisions 1243 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1243 | file | 2006-07-19 09:50:58 -0400 (Wed, 19 Jul 2006) | 2 lines
Only use hotplug firmware loading if the kernel has support for it
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1244 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp_base.c')
-rw-r--r-- | wct4xxp_base.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wct4xxp_base.c b/wct4xxp_base.c index 160b039..97205dc 100644 --- a/wct4xxp_base.c +++ b/wct4xxp_base.c @@ -43,9 +43,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" |