diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-27 07:05:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-29 05:15:13 -0400 |
commit | 454eeb2dd7bd0418451ea33a606d0fa50aa36718 (patch) | |
tree | b03b762b590343c1c90e83efbec3819c32a95bfb /arch/sparc/kernel/sun4d_irq.c | |
parent | 98261dd1a393777f4400d8ad5a29e97cb30e5422 (diff) |
sparc: Convert remaining sbus_ioremap() and sbus_iounmap() users.
Use of_ioremap() and of_iounmap() instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/sun4d_irq.c')
-rw-r--r-- | arch/sparc/kernel/sun4d_irq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index acfb447c00d0..c4a2bfb750a4 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c | |||
@@ -19,6 +19,8 @@ | |||
19 | #include <linux/smp.h> | 19 | #include <linux/smp.h> |
20 | #include <linux/spinlock.h> | 20 | #include <linux/spinlock.h> |
21 | #include <linux/seq_file.h> | 21 | #include <linux/seq_file.h> |
22 | #include <linux/of.h> | ||
23 | #include <linux/of_device.h> | ||
22 | 24 | ||
23 | #include <asm/ptrace.h> | 25 | #include <asm/ptrace.h> |
24 | #include <asm/processor.h> | 26 | #include <asm/processor.h> |
@@ -34,7 +36,6 @@ | |||
34 | #include <asm/io.h> | 36 | #include <asm/io.h> |
35 | #include <asm/pgalloc.h> | 37 | #include <asm/pgalloc.h> |
36 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
37 | #include <asm/sbus.h> | ||
38 | #include <asm/sbi.h> | 39 | #include <asm/sbi.h> |
39 | #include <asm/cacheflush.h> | 40 | #include <asm/cacheflush.h> |
40 | #include <asm/irq_regs.h> | 41 | #include <asm/irq_regs.h> |
@@ -475,7 +476,7 @@ static void __init sun4d_init_timers(irq_handler_t counter_fn) | |||
475 | r.start = CSR_BASE(0)+BW_TIMER_LIMIT; | 476 | r.start = CSR_BASE(0)+BW_TIMER_LIMIT; |
476 | #endif | 477 | #endif |
477 | r.flags = 0xf; | 478 | r.flags = 0xf; |
478 | sun4d_timers = (struct sun4d_timer_regs *) sbus_ioremap(&r, 0, | 479 | sun4d_timers = (struct sun4d_timer_regs *) of_ioremap(&r, 0, |
479 | PAGE_SIZE, "user timer"); | 480 | PAGE_SIZE, "user timer"); |
480 | 481 | ||
481 | sun4d_timers->l10_timer_limit = (((1000000/HZ) + 1) << 10); | 482 | sun4d_timers->l10_timer_limit = (((1000000/HZ) + 1) << 10); |