summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-06-26 13:00:55 -0400
committerMike Frysinger <vapier@gentoo.org>2011-07-23 01:18:25 -0400
commitb69c920cb11dde488239e6a4ea7f668983d628ac (patch)
tree3ed2f77ee7a1e8c901d9bbb6998944ddea62132a /arch/blackfin
parentb0759a4d233107b8f693c0834d4cb917d7fb3a7d (diff)
downloadlinux-b69c920cb11dde488239e6a4ea7f668983d628ac.tar.bz2
Blackfin: bf54x: tweak MMR pint names
The hardware block uses the name "request" rather than "irq", so update the struct accordingly. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/kernel/debug-mmrs.c2
-rw-r--r--arch/blackfin/mach-bf548/include/mach/irq.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c
index c40dd6bbeac2..3ae029654650 100644
--- a/arch/blackfin/kernel/debug-mmrs.c
+++ b/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/arch/blackfin/mach-bf548/include/mach/irq.h b/arch/blackfin/mach-bf548/include/mach/irq.h
index 533b8095b540..10dc142c518d 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;