diff options
| author | Valentine Barshak <vbarshak@ru.mvista.com> | 2007-12-30 15:28:50 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 14:35:01 -0800 |
| commit | da0e8fb00b862aa10265f0c64930b432cd44420b (patch) | |
| tree | 7e8ee6ba65a8826a24268e8e353798b97b30de2a /drivers/usb/host/ehci.h | |
| parent | 040fa1b9620cd019349414505828b2ffbeded7f8 (diff) | |
| download | blackbird-op-linux-da0e8fb00b862aa10265f0c64930b432cd44420b.tar.gz blackbird-op-linux-da0e8fb00b862aa10265f0c64930b432cd44420b.zip | |
USB: add ehci-ppc-of bus glue (device-tree aware)
This adds device-tree-aware ehci-ppc-of driver.
The code is based on the ehci-ppc-soc driver by
Stefan Roese <sr@denx.de>.
Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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) * definition below can die once the 4xx support is * finally ported over. */ -#if defined(CONFIG_PPC) +#if defined(CONFIG_PPC) && !defined(CONFIG_PPC_MERGE) #define readl_be(addr) in_be32((__force unsigned *)addr) #define writel_be(val, addr) out_be32((__force unsigned *)addr, val) #endif |
