[svn-commits] kpfleming: branch 1.4 r2283 - in /branches/1.4: ./ build_tools/

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sun Mar  4 23:42:41 2007
New Revision: 2283

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2283
Log:
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)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/build_tools/make_firmware_object
    branches/1.4/wcte12xp.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/build_tools/make_firmware_object
URL: http://svn.digium.com/view/zaptel/branches/1.4/build_tools/make_firmware_object?view=diff&rev=2283&r1=2282&r2=2283
==============================================================================
--- branches/1.4/build_tools/make_firmware_object (original)
+++ branches/1.4/build_tools/make_firmware_object Sun Mar  4 23:42:41 2007
@@ -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

Modified: branches/1.4/wcte12xp.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp.c?view=diff&rev=2283&r1=2282&r2=2283
==============================================================================
--- branches/1.4/wcte12xp.c (original)
+++ branches/1.4/wcte12xp.c Sun Mar  4 23:42:41 2007
@@ -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