sparc32: kernel/trace/trace.c wants DIE_OOPS

[linux-2.6-omap-h63xx.git] / arch / sparc / include / asm / parport.h

diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h
index d9830621c906bb67dae70ebc65eed5addd0f4bff..dff3f0253aa891c90172b7baef03e767a5c9f90a 100644 (file)
--- a/arch/sparc/include/asm/parport.h
+++ b/arch/sparc/include/asm/parport.h
@@ -8,7 +8,7 @@
 
 #include <linux/of_device.h>
 
-#include <asm/ebus.h>
+#include <asm/ebus_dma.h>
 #include <asm/ns87303.h>
 #include <asm/prom.h>
 
@@ -215,7 +215,7 @@ static int __devexit ecpp_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id ecpp_match[] = {
+static const struct of_device_id ecpp_match[] = {
        {
                .name = "ecpp",
        },