From 740a0dc4dccf9704d0a396723d6899bba527371d Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 9 Dec 2011 10:46:52 +0100 Subject: [PATCH] --- yaml --- r: 283157 b: refs/heads/master c: 9d0ced0084d8ae38883cc688ace8a9a4350d6bc9 h: refs/heads/master i: 283155: 5d2517ad83532aa3926df0f54458753aa8abba37 v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/timer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fa9d831eb93a..317ead7fdca9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ecb899b4e568afd9e659e80dcd10feb50e4b1dd +refs/heads/master: 9d0ced0084d8ae38883cc688ace8a9a4350d6bc9 diff --git a/trunk/arch/microblaze/kernel/timer.c b/trunk/arch/microblaze/kernel/timer.c index 3ba1e1c8c2eb..52e3eaf7f304 100644 --- a/trunk/arch/microblaze/kernel/timer.c +++ b/trunk/arch/microblaze/kernel/timer.c @@ -263,7 +263,7 @@ void __init time_init(void) timer_baseaddr = be32_to_cpup(of_get_property(timer, "reg", NULL)); timer_baseaddr = (unsigned long) ioremap(timer_baseaddr, PAGE_SIZE); - irq = be32_to_cpup(of_get_property(timer, "interrupts", NULL)); + irq = irq_of_parse_and_map(timer, 0); timer_num = be32_to_cpup(of_get_property(timer, "xlnx,one-timer-only", NULL)); if (timer_num) {