---

yaml --- r: 257890 b: refs/heads/master c: b69c920 h: refs/heads/master v: v3
git-mirror · Jul 23, 2011 · 5857254 · 5857254
1 parent 67d4e9e
commit 5857254
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0759a4d233107b8f693c0834d4cb917d7fb3a7d
+refs/heads/master: b69c920cb11dde488239e6a4ea7f668983d628ac
diff --git a/trunk/arch/blackfin/kernel/debug-mmrs.c b/trunk/arch/blackfin/kernel/debug-mmrs.c
@@ -1848,7 +1848,7 @@ static int __init bfin_debug_mmrs_init(void)
 			_buf = REGS_STR_PFX(buf, PINT, num);
 			__PINT(MASK_SET, mask_set);
 			__PINT(MASK_CLEAR, mask_clear);
-			__PINT(IRQ, irq);
+			__PINT(REQUEST, request);
 			__PINT(ASSIGN, assign);
 			__PINT(EDGE_SET, edge_set);
 			__PINT(EDGE_CLEAR, edge_clear);

diff --git a/trunk/arch/blackfin/mach-bf548/include/mach/irq.h b/trunk/arch/blackfin/mach-bf548/include/mach/irq.h
@@ -438,7 +438,7 @@
 struct bfin_pint_regs {
 	u32 mask_set;
 	u32 mask_clear;
-	u32 irq;
+	u32 request;
 	u32 assign;
 	u32 edge_set;
 	u32 edge_clear;