powerpc: Merge of_device.c and of_device.h
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/include/asm-ppc/of_device.h b/include/asm-powerpc/of_device.h
similarity index 94%
rename from include/asm-ppc/of_device.h
rename to include/asm-powerpc/of_device.h
index 575bce4..ddb16aa 100644
--- a/include/asm-ppc/of_device.h
+++ b/include/asm-powerpc/of_device.h
@@ -1,5 +1,5 @@
-#ifndef __OF_DEVICE_H__
-#define __OF_DEVICE_H__
+#ifndef _ASM_POWERPC_OF_DEVICE_H
+#define _ASM_POWERPC_OF_DEVICE_H
#include <linux/device.h>
#include <linux/mod_devicetable.h>
@@ -61,5 +61,4 @@
struct device *parent);
extern void of_release_dev(struct device *dev);
-#endif /* __OF_DEVICE_H__ */
-
+#endif /* _ASM_POWERPC_OF_DEVICE_H */
diff --git a/include/asm-ppc64/of_device.h b/include/asm-ppc64/of_device.h
deleted file mode 100644
index 7bc136e..0000000
--- a/include/asm-ppc64/of_device.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <asm-ppc/of_device.h>
-