[SPARC]: Merge asm-sparc{,64}/device.h

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/asm-sparc/device.h b/include/asm-sparc/device.h
index c0a7786..680e51d 100644 (file)
--- a/include/asm-sparc/device.h
+++ b/include/asm-sparc/device.h
@@ -19,5 +19,3 @@ struct dev_archdata {
 };
 
 #endif /* _ASM_SPARC_DEVICE_H */
-
-

diff --git a/include/asm-sparc64/device.h b/include/asm-sparc64/device.h
index 5111e87..4145c47 100644 (file)
--- a/include/asm-sparc64/device.h
+++ b/include/asm-sparc64/device.h
@@ -1,21 +1 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#ifndef _ASM_SPARC64_DEVICE_H
-#define _ASM_SPARC64_DEVICE_H
-
-struct device_node;
-struct of_device;
-
-struct dev_archdata {
-       void                    *iommu;
-       void                    *stc;
-       void                    *host_controller;
-
-       struct device_node      *prom_node;
-       struct of_device        *op;
-};
-
-#endif /* _ASM_SPARC64_DEVICE_H */
+#include <asm-sparc/device.h>