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@xxxxxxxxxxxxxxx> --- drivers/usb/host/ohci-sa1111.c | 3 +-- 1 file changed, 1 insertion(+), 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; -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
