Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6] / include / asm-powerpc / ibmebus.h

diff --git a/include/asm-powerpc/ibmebus.h b/include/asm-powerpc/ibmebus.h
index 55982b8e5b98943a1d9868f68701c4e3c2bb64e3..66112114b8c588b066c1ade4bd9778cda00bdb3c 100644 (file)
--- a/include/asm-powerpc/ibmebus.h
+++ b/include/asm-powerpc/ibmebus.h
@@ -37,17 +37,17 @@
 
 #ifndef _ASM_EBUS_H
 #define _ASM_EBUS_H
+#ifdef __KERNEL__
 
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/mod_devicetable.h>
 #include <asm/of_device.h>
 
-extern struct dma_mapping_ops ibmebus_dma_ops;
 extern struct bus_type ibmebus_bus_type;
 
 struct ibmebus_dev {   
-       char *name;
+       const char *name;
        struct of_device ofdev;
 };
 
@@ -64,7 +64,7 @@ void ibmebus_unregister_driver(struct ibmebus_driver *drv);
 
 int ibmebus_request_irq(struct ibmebus_dev *dev,
                        u32 ist, 
-                       irqreturn_t (*handler)(int, void*, struct pt_regs *),
+                       irq_handler_t handler,
                        unsigned long irq_flags, const char * devname,
                        void *dev_id);
 void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id);
@@ -80,4 +80,5 @@ static inline struct ibmebus_dev *to_ibmebus_dev(struct device *dev)
 }
 
 
+#endif /* __KERNEL__ */
 #endif /* _ASM_IBMEBUS_H */