Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ebb8f0f authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman
Browse files

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: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e2aa1bc

drivers/usb/host/ohci-sa1111.c

+1 −2
Original line number Diff line number Diff line
@@ -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;