diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-26 17:41:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-30 19:24:59 +0200 |
| commit | 6ebb8f0f83ffc0a482380a84772f35f2548d7eca (patch) | |
| tree | e56367c4146352024a6fc127db207a28c7bb2756 /drivers/usb/host | |
| parent | 2e2aa1bc7eff90ecc1dddfc593aef07c57e539d0 (diff) | |
| download | linux-stable-6ebb8f0f83ffc0a482380a84772f35f2548d7eca.tar.gz linux-stable-6ebb8f0f83ffc0a482380a84772f35f2548d7eca.tar.bz2 linux-stable-6ebb8f0f83ffc0a482380a84772f35f2548d7eca.zip | |
usb: ohci-sa1111: remove machine_has_neponset()
The neponset is a daughter board for the Assabet platform, which has a
SA1111 chip on it. If we're initialising the SA1111 OHCI, and we're
part of a neponset, the host platform must be an Assabet.
This allows us to eliminate machine_has_neponset() from this driver,
replacing it instead with machine_is_assabet(), and killing the
mach/assabet.h include.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/ohci-sa1111.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c index 2ac266d692a2..6dc5eaed8551 100644 --- a/drivers/usb/host/ohci-sa1111.c +++ b/drivers/usb/host/ohci-sa1111.c @@ -15,7 +15,6 @@ #include <mach/hardware.h> #include <asm/mach-types.h> -#include <mach/assabet.h> #include <asm/hardware/sa1111.h> #ifndef CONFIG_SA1111 @@ -127,7 +126,7 @@ static int sa1111_start_hc(struct sa1111_dev *dev) dev_dbg(&dev->dev, "starting SA-1111 OHCI USB Controller\n"); if (machine_is_xp860() || - machine_has_neponset() || + machine_is_assabet() || machine_is_pfs168() || machine_is_badge4()) usb_rst = USB_RESET_PWRSENSELOW | USB_RESET_PWRCTRLLOW; |