diff options
author | Felipe Balbi <balbi@ti.com> | 2011-06-27 08:56:32 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-01 17:31:14 -0400 |
commit | ded1ddbf92ee2c8f04af7fe805e1074be5d41f7f (patch) | |
tree | 8b88a606a40b28ff7745d319d7829d9684219a2c | |
parent | 019f976e8f268a63b2fcbb662aa2f77f6b07bac6 (diff) |
usb: musb: omap: always create musb device
there's no point in not creating that device
always. It's simpler to always create, than to
keep changing that stupid ifdef.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | arch/arm/mach-omap2/usb-musb.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index c7ed540d868d..a65145b02a55 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c | |||
@@ -33,8 +33,6 @@ | |||
33 | #include <plat/omap_device.h> | 33 | #include <plat/omap_device.h> |
34 | #include "mux.h" | 34 | #include "mux.h" |
35 | 35 | ||
36 | #if defined(CONFIG_USB_MUSB_OMAP2PLUS) || defined (CONFIG_USB_MUSB_AM35X) | ||
37 | |||
38 | static struct musb_hdrc_config musb_config = { | 36 | static struct musb_hdrc_config musb_config = { |
39 | .multipoint = 1, | 37 | .multipoint = 1, |
40 | .dyn_fifo = 1, | 38 | .dyn_fifo = 1, |
@@ -175,11 +173,3 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) | |||
175 | if (cpu_is_omap44xx()) | 173 | if (cpu_is_omap44xx()) |
176 | omap4430_phy_init(dev); | 174 | omap4430_phy_init(dev); |
177 | } | 175 | } |
178 | |||
179 | #else | ||
180 | void __init usb_musb_init(struct omap_musb_board_data *board_data) | ||
181 | { | ||
182 | if (cpu_is_omap44xx()) | ||
183 | omap4430_phy_init(NULL); | ||
184 | } | ||
185 | #endif /* CONFIG_USB_MUSB_SOC */ | ||