Merge tag 'jfs-3.7-2' of git://github.com/kleikamp/linux-shaggy

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / of_address.h

diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index c3cdc1025c30694eee350d9cd62609e4db40de02..a1984dd037da8c13d11a18336fdff331c356fc97 100644 (file)
--- 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
@@ -44,7 +44,7 @@ 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,
+static inline const __be32 *of_get_address(struct device_node *dev, int index,
                                        u64 *size, unsigned int *flags)
 {
        return NULL;