---

yaml --- r: 212136 b: refs/heads/master c: e7ffec1 h: refs/heads/master v: v3
git-mirror · Oct 4, 2010 · 2a64a34 · 2a64a34
1 parent 65fce14
commit 2a64a34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;