Commit d0678594 authored by Mian Yousaf Kaukab's avatar Mian Yousaf Kaukab Committed by Greg Kroah-Hartman
Browse files

usb: musb: remove incorrectly added ARCH_U5500 define 



ARCH_U8500 covers both MACH_U8500 and MACH_U5500

Reported-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarMian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 59d81f81

drivers/usb/musb/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ config USB_MUSB_BLACKFIN 


config USB_MUSB_UX500

	tristate "U8500 and U5500"

	depends on (ARCH_U8500 && AB8500_USB) || (ARCH_U5500)

	depends on (ARCH_U8500 && AB8500_USB)



endchoice

drivers/usb/musb/musb_core.c

+1 −2
Original line number Diff line number Diff line
@@ -1477,8 +1477,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb) 
/*-------------------------------------------------------------------------*/



#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \

	defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500) || \

	defined(CONFIG_ARCH_U5500)

	defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500)



static irqreturn_t generic_interrupt(int irq, void *__hci)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE