aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-06-08 09:48:14 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-07-05 18:14:29 -0400
commit94c0931983ee9d1cd96c32d52ac64c17464f0bbd (patch)
tree188c9d7ef9dfb560563078d6d2f3872291686f58 /arch/powerpc/include/asm
parent5fd200f3b351183b5489cef69961c60af9cead2f (diff)
of: Merge of_device_alloc() and of_device_make_bus_id()
This patch merges the common routines of_device_alloc() and of_device_make_bus_id() from powerpc and microblaze. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> CC: Michal Simek <monstr@monstr.eu> CC: Grant Likely <grant.likely@secretlab.ca> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: Stephen Rothwell <sfr@canb.auug.org.au> CC: microblaze-uclinux@itee.uq.edu.au CC: linuxppc-dev@ozlabs.org CC: devicetree-discuss@lists.ozlabs.org
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r--arch/powerpc/include/asm/of_device.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/powerpc/include/asm/of_device.h b/arch/powerpc/include/asm/of_device.h
index 5d5103cac641..04f76717f82c 100644
--- a/arch/powerpc/include/asm/of_device.h
+++ b/arch/powerpc/include/asm/of_device.h
@@ -1,13 +1,3 @@
1#ifndef _ASM_POWERPC_OF_DEVICE_H 1#ifndef _ASM_POWERPC_OF_DEVICE_H
2#define _ASM_POWERPC_OF_DEVICE_H 2#define _ASM_POWERPC_OF_DEVICE_H
3#ifdef __KERNEL__
4
5#include <linux/device.h>
6#include <linux/of.h>
7
8extern struct of_device *of_device_alloc(struct device_node *np,
9 const char *bus_id,
10 struct device *parent);
11
12#endif /* __KERNEL__ */
13#endif /* _ASM_POWERPC_OF_DEVICE_H */ 3#endif /* _ASM_POWERPC_OF_DEVICE_H */