diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-06 13:22:17 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-06 13:22:17 +1000 |
| commit | 2e686bc3bf6268e30eb9584e0bcd43b7bec28f3b (patch) | |
| tree | ec000e3c6528e3edfcd0e03a3950ffee909ae8c6 /include | |
| parent | 187a00679ad51dfb3d3e74620217417102784218 (diff) | |
| download | blackbird-op-linux-2e686bc3bf6268e30eb9584e0bcd43b7bec28f3b.tar.gz blackbird-op-linux-2e686bc3bf6268e30eb9584e0bcd43b7bec28f3b.zip | |
powerpc: Merge of_device.c and of_device.h
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/of_device.h (renamed from include/asm-ppc/of_device.h) | 7 | ||||
| -rw-r--r-- | include/asm-ppc64/of_device.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/asm-ppc/of_device.h b/include/asm-powerpc/of_device.h index 575bce418f80..ddb16aae0bd6 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 @@ extern struct of_device *of_platform_device_create(struct device_node *np, 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 7bc136e22590..000000000000 --- a/include/asm-ppc64/of_device.h +++ /dev/null @@ -1,2 +0,0 @@ -#include <asm-ppc/of_device.h> - |
