diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-27 07:54:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-29 05:15:21 -0400 |
commit | 046e26a8ba10b8ceff822f8d91451ab6c1e08c4e (patch) | |
tree | 92e95380c0f7f6c5257023a59b88d4221d3f9744 /arch/sparc/kernel | |
parent | 5059625ed8862e897760b86effff0f8a35989c0d (diff) |
sparc: Remove generic SBUS probing layer.
The individual SBUS IOMMU arch code now sets the IOMMU information
directly into the OF device objects.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r-- | arch/sparc/kernel/ioport.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 24645f9f56f5..bca2d6fd5c4c 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c | |||
@@ -377,22 +377,6 @@ void sbus_dma_sync_single_for_device(struct device *dev, dma_addr_t ba, size_t s | |||
377 | { | 377 | { |
378 | } | 378 | } |
379 | 379 | ||
380 | /* Support code for sbus_init(). */ | ||
381 | void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp) | ||
382 | { | ||
383 | #ifndef CONFIG_SUN4 | ||
384 | struct device_node *parent = dp->parent; | ||
385 | |||
386 | if (sparc_cpu_model != sun4d && | ||
387 | parent != NULL && | ||
388 | !strcmp(parent->name, "iommu")) | ||
389 | iommu_init(parent, sbus); | ||
390 | |||
391 | if (sparc_cpu_model == sun4d) | ||
392 | iounit_init(sbus); | ||
393 | #endif | ||
394 | } | ||
395 | |||
396 | static int __init sparc_register_ioport(void) | 380 | static int __init sparc_register_ioport(void) |
397 | { | 381 | { |
398 | register_proc_sparc_ioport(); | 382 | register_proc_sparc_ioport(); |
@@ -402,13 +386,6 @@ static int __init sparc_register_ioport(void) | |||
402 | 386 | ||
403 | arch_initcall(sparc_register_ioport); | 387 | arch_initcall(sparc_register_ioport); |
404 | 388 | ||
405 | void __init sbus_arch_postinit(void) | ||
406 | { | ||
407 | if (sparc_cpu_model == sun4d) { | ||
408 | extern void sun4d_init_sbi_irq(void); | ||
409 | sun4d_init_sbi_irq(); | ||
410 | } | ||
411 | } | ||
412 | #endif /* CONFIG_SBUS */ | 389 | #endif /* CONFIG_SBUS */ |
413 | 390 | ||
414 | #ifdef CONFIG_PCI | 391 | #ifdef CONFIG_PCI |