commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=ea6a8a0f1385709a32514ded8cadffde09c7e855
branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk

The hardware block uses the name "request" rather than "irq", so update
the struct accordingly.

Signed-off-by: Mike Frysinger <[email protected]>
---
 arch/blackfin/kernel/debug-mmrs.c           |    2 +-
 arch/blackfin/mach-bf548/include/mach/irq.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c
index 8e3b88b..4adb30f 100644
--- a/arch/blackfin/kernel/debug-mmrs.c
+++ b/arch/blackfin/kernel/debug-mmrs.c
@@ -1847,7 +1847,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/arch/blackfin/mach-bf548/include/mach/irq.h b/arch/blackfin/mach-bf548/include/mach/irq.h
index 533b809..10dc142 100644
--- a/arch/blackfin/mach-bf548/include/mach/irq.h
+++ b/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;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to