madwifi/hal/linux mips-be-elf.hal.o.uu,1.6,1.7 mips-be-elf.opt_ah.h,1.2,1.3 powerpc-be-eabi.inc,1.2,1.3 powerpc-le-eabi.inc,1.2,1.3

Update of /cvsroot/madwifi/madwifi/hal/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9321

Modified Files:
	mips-be-elf.hal.o.uu mips-be-elf.opt_ah.h powerpc-be-eabi.inc 
	powerpc-le-eabi.inc 
Log Message:
resolve merge conflicts

Index: mips-be-elf.opt_ah.h
===================================================================
RCS file: /cvsroot/madwifi/madwifi/hal/linux/mips-be-elf.opt_ah.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mips-be-elf.opt_ah.h	9 Mar 2004 04:42:30 -0000	1.2
--- mips-be-elf.opt_ah.h	12 Sep 2004 01:00:50 -0000	1.3
***************
*** 2,4 ****
  #define AH_SUPPORT_AR5211	1
  #define AH_SUPPORT_AR5212	1
- #define AH_ENABLE_TX_TPC 1
--- 2,3 ----

Index: powerpc-be-eabi.inc
===================================================================
RCS file: /cvsroot/madwifi/madwifi/hal/linux/powerpc-be-eabi.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3