From 74e9ca44a51a8dce5036aa836ffede474b82496b Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Jul 2008 08:01:15 -0700
Subject: [PATCH] --- yaml --- r: 101060 b: refs/heads/master c:
 97c7d1ea1f80f457da78b11ca638b7096a4548ee h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/firmware/Makefile        |  2 --
 trunk/include/asm-x86/dwarf2.h | 30 +++++++++++++++---------------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 3412784ab26a..5283df0c29a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f507d28bff0601f1a8a96b7939fa3855c50d25b6
+refs/heads/master: 97c7d1ea1f80f457da78b11ca638b7096a4548ee
diff --git a/trunk/firmware/Makefile b/trunk/firmware/Makefile
index 809a52624bda..e4f2fb3d1917 100644
--- a/trunk/firmware/Makefile
+++ b/trunk/firmware/Makefile
@@ -34,8 +34,6 @@ fw-shipped-$(CONFIG_SND_SB16_CSP) += sb16/mulaw_main.csp sb16/alaw_main.csp \
 				     sb16/ima_adpcm_capture.csp
 fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
 				   yamaha/ds1e_ctrl.fw
-fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
-			       tigon/tg3_tso5.bin
 fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
 fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
 				  emi26/bitstream.fw
diff --git a/trunk/include/asm-x86/dwarf2.h b/trunk/include/asm-x86/dwarf2.h
index 0bfe250894f7..fd4a6a0393ac 100644
--- a/trunk/include/asm-x86/dwarf2.h
+++ b/trunk/include/asm-x86/dwarf2.h
@@ -38,23 +38,23 @@
 
 /* Due to the structure of pre-exisiting code, don't use assembler line
    comment character # to ignore the arguments. Instead, use a dummy macro. */
-.macro ignore a=0, b=0, c=0, d=0
+.macro __cfi_ignore a=0, b=0, c=0, d=0
 .endm
 
-#define CFI_STARTPROC	ignore
-#define CFI_ENDPROC	ignore
-#define CFI_DEF_CFA	ignore
-#define CFI_DEF_CFA_REGISTER	ignore
-#define CFI_DEF_CFA_OFFSET	ignore
-#define CFI_ADJUST_CFA_OFFSET	ignore
-#define CFI_OFFSET	ignore
-#define CFI_REL_OFFSET	ignore
-#define CFI_REGISTER	ignore
-#define CFI_RESTORE	ignore
-#define CFI_REMEMBER_STATE ignore
-#define CFI_RESTORE_STATE ignore
-#define CFI_UNDEFINED ignore
-#define CFI_SIGNAL_FRAME ignore
+#define CFI_STARTPROC	__cfi_ignore
+#define CFI_ENDPROC	__cfi_ignore
+#define CFI_DEF_CFA	__cfi_ignore
+#define CFI_DEF_CFA_REGISTER	__cfi_ignore
+#define CFI_DEF_CFA_OFFSET	__cfi_ignore
+#define CFI_ADJUST_CFA_OFFSET	__cfi_ignore
+#define CFI_OFFSET	__cfi_ignore
+#define CFI_REL_OFFSET	__cfi_ignore
+#define CFI_REGISTER	__cfi_ignore
+#define CFI_RESTORE	__cfi_ignore
+#define CFI_REMEMBER_STATE __cfi_ignore
+#define CFI_RESTORE_STATE __cfi_ignore
+#define CFI_UNDEFINED __cfi_ignore
+#define CFI_SIGNAL_FRAME __cfi_ignore
 
 #endif