aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKumar Gala <galak@freescale.com>2005-10-20 12:44:03 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-26 01:52:56 -0400
commit60dda2565bbf31bbe662fd143a41c861b7a190cf (patch)
tree26821704b421cbfc50f50dc2cb7f028960b7294d /include
parentd2e615125762459fd2bb9f0c91881509a0b9c31b (diff)
[PATCH] powerpc: some prom.c cleanups
On !CONFIG_PPC_MULTIPLATFORM _machine is defined as 0. This is ok, but we can't assign a value to _machine then. We may not have CONFIG_PCI available, so only build in support for find_parent_pci_resource(), request_OF_resource(), release_OF_resource() if PCI is enabled. This is probably not the long term fix but works out for now. Make reg_property64 contain 64-bit elements on a 32-bit machine. Mark the deprecated prom.c functions as __deprecated. Signed-off-by: Kumar K. Gala <kumar.gala@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/prom.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h
index 8a21791c7cae..49d2c7455f8e 100644
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -104,8 +104,8 @@ struct reg_property32 {
104}; 104};
105 105
106struct reg_property64 { 106struct reg_property64 {
107 unsigned long address; 107 u64 address;
108 unsigned long size; 108 u64 size;
109}; 109};
110 110
111struct property { 111struct property {
@@ -155,12 +155,12 @@ static inline void set_node_proc_entry(struct device_node *dn, struct proc_dir_e
155 155
156 156
157/* OBSOLETE: Old style node lookup */ 157/* OBSOLETE: Old style node lookup */
158extern struct device_node *find_devices(const char *name); 158extern __deprecated struct device_node *find_devices(const char *name);
159extern struct device_node *find_type_devices(const char *type); 159extern __deprecated struct device_node *find_type_devices(const char *type);
160extern struct device_node *find_path_device(const char *path); 160extern __deprecated struct device_node *find_path_device(const char *path);
161extern struct device_node *find_compatible_devices(const char *type, 161extern __deprecated struct device_node *find_compatible_devices(const char *type,
162 const char *compat); 162 const char *compat);
163extern struct device_node *find_all_nodes(void); 163extern __deprecated struct device_node *find_all_nodes(void);
164 164
165/* New style node lookup */ 165/* New style node lookup */
166extern struct device_node *of_find_node_by_name(struct device_node *from, 166extern struct device_node *of_find_node_by_name(struct device_node *from,