Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Russell King and committed by
Greg Kroah-Hartman
6ebb8f0f 2e2aa1bc

+1 -2
+1 -2
drivers/usb/host/ohci-sa1111.c
··· 15 15 16 16 #include <mach/hardware.h> 17 17 #include <asm/mach-types.h> 18 - #include <mach/assabet.h> 19 18 #include <asm/hardware/sa1111.h> 20 19 21 20 #ifndef CONFIG_SA1111 ··· 126 127 dev_dbg(&dev->dev, "starting SA-1111 OHCI USB Controller\n"); 127 128 128 129 if (machine_is_xp860() || 129 - machine_has_neponset() || 130 + machine_is_assabet() || 130 131 machine_is_pfs168() || 131 132 machine_is_badge4()) 132 133 usb_rst = USB_RESET_PWRSENSELOW | USB_RESET_PWRCTRLLOW;