From 2a64a340c80dba5a35ddef96b07e127d5c54ebd8 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 3 Oct 2010 20:08:13 +0200
Subject: [PATCH] --- yaml --- r: 212136 b: refs/heads/master c:
 e7ffec1eb178db349c7fbfd647725e9d06619962 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/isdn/act2000/act2000.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 53296c5a790e..8fa790bd4e54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35a27e8e6565910e5202f1af83ea85305fbf5ceb
+refs/heads/master: e7ffec1eb178db349c7fbfd647725e9d06619962
diff --git a/trunk/drivers/isdn/act2000/act2000.h b/trunk/drivers/isdn/act2000/act2000.h
index d4c50512a1ff..88c9423500d8 100644
--- a/trunk/drivers/isdn/act2000/act2000.h
+++ b/trunk/drivers/isdn/act2000/act2000.h
@@ -141,9 +141,9 @@ typedef struct irq_data_isa {
 	__u8            rcvhdr[8];
 } irq_data_isa;
 
-typedef union irq_data {
+typedef union act2000_irq_data {
 	irq_data_isa isa;
-} irq_data;
+} act2000_irq_data;
 
 /*
  * Per card driver data
@@ -176,7 +176,7 @@ typedef struct act2000_card {
 	char   *status_buf_read;
 	char   *status_buf_write;
 	char   *status_buf_end;
-	irq_data idat;			/* Data used for IRQ handler        */
+	act2000_irq_data idat;		/* Data used for IRQ handler        */
 	isdn_if interface;		/* Interface to upper layer         */
 	char regname[35];		/* Name used for request_region     */
 } act2000_card;