Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[karo-tx-linux.git] / arch / sparc / include / asm / device.h

diff --git a/arch/sparc/include/asm/device.h b/arch/sparc/include/asm/device.h
index d4c45214741252d7327daf0ba0f50c10dcef6f5f..daa6a8a5e9cd0d5dfa102ca89639d3eda8d53f5c 100644 (file)
--- a/arch/sparc/include/asm/device.h
+++ b/arch/sparc/include/asm/device.h
@@ -6,18 +6,25 @@
 #ifndef _ASM_SPARC_DEVICE_H
 #define _ASM_SPARC_DEVICE_H
 
+#include <asm/openprom.h>
+
 struct device_node;
-struct of_device;
+struct platform_device;
 
 struct dev_archdata {
        void                    *iommu;
        void                    *stc;
        void                    *host_controller;
-       struct of_device        *op;
+       struct platform_device  *op;
        int                     numa_node;
 };
 
+extern void of_propagate_archdata(struct platform_device *bus);
+
 struct pdev_archdata {
+       struct resource         resource[PROMREG_MAX];
+       unsigned int            irqs[PROMINTR_MAX];
+       int                     num_irqs;
 };
 
 #endif /* _ASM_SPARC_DEVICE_H */