Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 160874
b: refs/heads/master
c: 12b8eb8
h: refs/heads/master
v: v3
  • Loading branch information
Sascha Hauer committed Aug 14, 2009
1 parent b6101c2 commit c34feff
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c372a5cf4cde161c7f59bbe7a9ebcfce9cb2c2f8
refs/heads/master: 12b8eb865285c95d6e2c02555f066e3f949e090d
3 changes: 2 additions & 1 deletion trunk/arch/arm/plat-mxc/include/mach/entry-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
.endm

.macro get_irqnr_preamble, base, tmp
ldr \base, =AVIC_IO_ADDRESS(AVIC_BASE_ADDR)
ldr \base, =avic_base
ldr \base, [\base]
#ifdef CONFIG_MXC_IRQ_PRIOR
ldr r4, [\base, #AVIC_NIMASK]
#endif
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/plat-mxc/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#define AVIC_FIPNDH 0x60 /* fast int pending high */
#define AVIC_FIPNDL 0x64 /* fast int pending low */

static void __iomem *avic_base;
void __iomem *avic_base;

int imx_irq_set_priority(unsigned char irq, unsigned char prio)
{
Expand Down

0 comments on commit c34feff

Please sign in to comment.