提交 d0678594 编写于 作者: M Mian Yousaf Kaukab 提交者: Greg Kroah-Hartman

usb: musb: remove incorrectly added ARCH_U5500 define

ARCH_U8500 covers both MACH_U8500 and MACH_U5500
Reported-by: NPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: NMian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Acked-by: NLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: NFelipe Balbi <balbi@ti.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 59d81f81
...@@ -60,7 +60,7 @@ config USB_MUSB_BLACKFIN ...@@ -60,7 +60,7 @@ config USB_MUSB_BLACKFIN
config USB_MUSB_UX500 config USB_MUSB_UX500
tristate "U8500 and U5500" tristate "U8500 and U5500"
depends on (ARCH_U8500 && AB8500_USB) || (ARCH_U5500) depends on (ARCH_U8500 && AB8500_USB)
endchoice endchoice
......
...@@ -1477,8 +1477,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb) ...@@ -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) || \ #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \
defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500) || \ defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500)
defined(CONFIG_ARCH_U5500)
static irqreturn_t generic_interrupt(int irq, void *__hci) static irqreturn_t generic_interrupt(int irq, void *__hci)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册