---

yaml --- r: 283157 b: refs/heads/master c: 9d0ced0 h: refs/heads/master i: 283155: 5d2517a v: v3
git-mirror · Jan 5, 2012 · 740a0dc · 740a0dc
1 parent 77972d7
commit 740a0dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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) {