fat: Fix ATTR_RO for directory

[linux-2.6-omap-h63xx.git] / arch / sparc64 / kernel / sbus.c

diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c
index 60605eaf49bb0b846e29849731c8a73572b2607f..2ead310066d1b60b4f6098c2f18aa37d3d175581 100644 (file)
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
@@ -11,15 +11,17 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 
 #include <asm/page.h>
-#include <asm/sbus.h>
 #include <asm/io.h>
 #include <asm/upa.h>
 #include <asm/cache.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
+#include <asm/oplib.h>
 #include <asm/starfire.h>
 
 #include "iommu_common.h"
@@ -657,7 +659,6 @@ fatal_memory_error:
 
 static int __init sbus_init(void)
 {
-       extern void firetruck_init(void);
        struct device_node *dp;
 
        for_each_node_by_name(dp, "sbus") {
@@ -667,8 +668,6 @@ static int __init sbus_init(void)
                of_propagate_archdata(op);
        }
 
-       firetruck_init();
-
        return 0;
 }