From 585725437c24ed189e2278c6723bc3273b9fec7b Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 26 Jun 2011 13:00:55 -0400
Subject: [PATCH] --- yaml --- r: 257890 b: refs/heads/master c:
 b69c920cb11dde488239e6a4ea7f668983d628ac h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/arch/blackfin/kernel/debug-mmrs.c           | 2 +-
 trunk/arch/blackfin/mach-bf548/include/mach/irq.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ff7ad0031d0f..c0404278daf3 100644
--- 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
index c40dd6bbeac2..3ae029654650 100644
--- 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
index 533b8095b540..10dc142c518d 100644
--- 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;