Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296259
b: refs/heads/master
c: 927b6c4
h: refs/heads/master
i:
  296257: dbe4c17
  296255: 18e66e8
v: v3
  • Loading branch information
Russell King committed Mar 24, 2012
1 parent d5ee7f8 commit 96898b2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 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: 18a66d5ae982c1e07d67a85e3723a1838caf79f6
refs/heads/master: 927b6c4da9e30f8f55add2e19487e71415c85bda
2 changes: 0 additions & 2 deletions trunk/arch/arm/mach-rpc/include/mach/irqs.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,4 @@
*/
#define FIQ_START 64

#define IRQ_TIMER IRQ_TIMER0

#define NR_IRQS 128
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-rpc/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ static struct irqaction ioc_timer_irq = {
static void __init ioc_timer_init(void)
{
ioctime_init();
setup_irq(IRQ_TIMER, &ioc_timer_irq);
setup_irq(IRQ_TIMER0, &ioc_timer_irq);
}

struct sys_timer ioc_timer = {
Expand Down

0 comments on commit 96898b2

Please sign in to comment.