diff options
Diffstat (limited to 'drivers/usb/host/ehci.h')
| -rw-r--r-- | drivers/usb/host/ehci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index eeda4c88ebae..c78c52771e64 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
| @@ -741,7 +741,7 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc) | |||
| 741 | * definition below can die once the 4xx support is | 741 | * definition below can die once the 4xx support is |
| 742 | * finally ported over. | 742 | * finally ported over. |
| 743 | */ | 743 | */ |
| 744 | #if defined(CONFIG_PPC) | 744 | #if defined(CONFIG_PPC) && !defined(CONFIG_PPC_MERGE) |
| 745 | #define readl_be(addr) in_be32((__force unsigned *)addr) | 745 | #define readl_be(addr) in_be32((__force unsigned *)addr) |
| 746 | #define writel_be(val, addr) out_be32((__force unsigned *)addr, val) | 746 | #define writel_be(val, addr) out_be32((__force unsigned *)addr, val) |
| 747 | #endif | 747 | #endif |