powerpc: Merge of_device.c and of_device.h

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras 2005-10-06 13:22:17 +10:00
commit 2e686bc3bf
3 changed files with 277 additions and 6 deletions

View file

@ -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 */

View file

@ -1,2 +0,0 @@
#include <asm-ppc/of_device.h>