From: David S. Miller <davem@sunset.davemloft.net>
Date: Fri, 16 Nov 2007 11:15:05 +0000 (-0800)
Subject: [SPARC]: Merge asm-sparc{,64}/device.h
X-Git-Tag: v3.12-rc1~22900^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04c3ddf965ab46f7e24c2399dc85deca2f08ef5b;p=kernel%2Fkernel-generic.git

[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
--- 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
--- 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>