diff options
Diffstat (limited to 'include/linux/of_address.h')
| -rw-r--r-- | include/linux/of_address.h | 8 | 
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/of_address.h b/include/linux/of_address.h index c3cdc1025c3..0506eb53519 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -19,7 +19,7 @@ extern void __iomem *of_iomap(struct device_node *device, int index);   * the address space flags too. The PCI version uses a BAR number   * instead of an absolute index   */ -extern const u32 *of_get_address(struct device_node *dev, int index, +extern const __be32 *of_get_address(struct device_node *dev, int index,  			   u64 *size, unsigned int *flags);  #ifndef pci_address_to_pio @@ -28,11 +28,13 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; }  #endif  #else /* CONFIG_OF_ADDRESS */ +#ifndef of_address_to_resource  static inline int of_address_to_resource(struct device_node *dev, int index,  					 struct resource *r)  {  	return -EINVAL;  } +#endif  static inline struct device_node *of_find_matching_node_by_address(  					struct device_node *from,  					const struct of_device_id *matches, @@ -40,11 +42,13 @@ static inline struct device_node *of_find_matching_node_by_address(  {  	return NULL;  } +#ifndef of_iomap  static inline void __iomem *of_iomap(struct device_node *device, int index)  {  	return NULL;  } -static inline const u32 *of_get_address(struct device_node *dev, int index, +#endif +static inline const __be32 *of_get_address(struct device_node *dev, int index,  					u64 *size, unsigned int *flags)  {  	return NULL;  |