diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:57:46 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:57:46 -0400 |
commit | 731581e6a653f6a68a4d7ba9df6b886a85c7d080 (patch) | |
tree | a89d70ebec3e3d9d261625344d1edcd5e24a905a /arch | |
parent | 9d24c888c779c877f1baf5a73e0cec78266ff7bb (diff) |
of: merge phandle, ihandle and struct property
Merge of common code duplicated between Sparc, PowerPC and Microblaze
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/include/asm/prom.h | 10 | ||||
-rw-r--r-- | arch/powerpc/include/asm/prom.h | 12 | ||||
-rw-r--r-- | arch/sparc/include/asm/prom.h | 12 |
3 files changed, 0 insertions, 34 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index 66368896f922..11cb48419c7d 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
@@ -73,16 +73,6 @@ struct boot_param_header { | |||
73 | u32 dt_struct_size; /* size of the DT structure block */ | 73 | u32 dt_struct_size; /* size of the DT structure block */ |
74 | }; | 74 | }; |
75 | 75 | ||
76 | typedef u32 phandle; | ||
77 | typedef u32 ihandle; | ||
78 | |||
79 | struct property { | ||
80 | char *name; | ||
81 | int length; | ||
82 | void *value; | ||
83 | struct property *next; | ||
84 | }; | ||
85 | |||
86 | struct device_node { | 76 | struct device_node { |
87 | const char *name; | 77 | const char *name; |
88 | const char *type; | 78 | const char *type; |
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h index b0a84ea5f8ed..c236326177a8 100644 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h | |||
@@ -71,18 +71,6 @@ struct boot_param_header | |||
71 | u32 dt_struct_size; /* size of the DT structure block */ | 71 | u32 dt_struct_size; /* size of the DT structure block */ |
72 | }; | 72 | }; |
73 | 73 | ||
74 | |||
75 | |||
76 | typedef u32 phandle; | ||
77 | typedef u32 ihandle; | ||
78 | |||
79 | struct property { | ||
80 | char *name; | ||
81 | int length; | ||
82 | void *value; | ||
83 | struct property *next; | ||
84 | }; | ||
85 | |||
86 | struct device_node { | 74 | struct device_node { |
87 | const char *name; | 75 | const char *name; |
88 | const char *type; | 76 | const char *type; |
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h index 0733170e02ca..b34f988a2aad 100644 --- a/arch/sparc/include/asm/prom.h +++ b/arch/sparc/include/asm/prom.h | |||
@@ -29,18 +29,6 @@ | |||
29 | #define of_prop_cmp(s1, s2) strcasecmp((s1), (s2)) | 29 | #define of_prop_cmp(s1, s2) strcasecmp((s1), (s2)) |
30 | #define of_node_cmp(s1, s2) strcmp((s1), (s2)) | 30 | #define of_node_cmp(s1, s2) strcmp((s1), (s2)) |
31 | 31 | ||
32 | typedef u32 phandle; | ||
33 | typedef u32 ihandle; | ||
34 | |||
35 | struct property { | ||
36 | char *name; | ||
37 | int length; | ||
38 | void *value; | ||
39 | struct property *next; | ||
40 | unsigned long _flags; | ||
41 | unsigned int unique_id; | ||
42 | }; | ||
43 | |||
44 | struct of_irq_controller; | 32 | struct of_irq_controller; |
45 | struct device_node { | 33 | struct device_node { |
46 | const char *name; | 34 | const char *name; |