diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-03-05 05:42:41 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-03-05 05:42:41 +0000 |
commit | 2c90e2371bcc9ec397d74f0498fc524657f6c4e2 (patch) | |
tree | eedb3df77150f836e23aa45f5d7e8ea09ea5379c | |
parent | e0c4cece4093c999e28246554b94c984bab3ab16 (diff) |
Merged revisions 2280-2282 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r2280 | kpfleming | 2007-03-04 23:34:43 -0600 (Sun, 04 Mar 2007) | 2 lines
ensure that we run objdump in the most generic language possible to avoid complications on non-English systems (issue #9196)
........
r2281 | kpfleming | 2007-03-04 23:40:37 -0600 (Sun, 04 Mar 2007) | 2 lines
remove stray character that my editor decided to add
........
r2282 | kpfleming | 2007-03-04 23:41:30 -0600 (Sun, 04 Mar 2007) | 2 lines
this driver does not use workqueues, so does not need this header (issue #9196)
........
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2283 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rwxr-xr-x | build_tools/make_firmware_object | 4 | ||||
-rw-r--r-- | wcte12xp.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/build_tools/make_firmware_object b/build_tools/make_firmware_object index b00c8f9..4d72110 100755 --- a/build_tools/make_firmware_object +++ b/build_tools/make_firmware_object @@ -6,7 +6,7 @@ # 2 - output file # 3 - template output file (used to learn desired format) -bfdname=`objdump -f ${3} | grep -e "${3}:" | sed "s/.*file format \(.*\)/\1/"` -bfdarch=`objdump -f ${3} | grep -e "architecture:" | sed "s/.*ture: \(.*\),.*/\1/"` +bfdname=`LANG=C objdump -f ${3} | grep -e "${3}:" | sed "s/.*file format \(.*\)/\1/"` +bfdarch=`LANG=C objdump -f ${3} | grep -e "architecture:" | sed "s/.*ture: \(.*\),.*/\1/"` objcopy -I binary ${1} -B ${bfdarch} -O ${bfdname} ${2} --rename-section .data=.rodata,alloc,load,data,contents,readonly @@ -35,7 +35,6 @@ #include <linux/errno.h> #include <linux/pci.h> #include <linux/interrupt.h> -#include <linux/workqueue.h> #include <linux/proc_fs.h> #ifdef STANDALONE_ZAPATA |