aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2011-06-29 05:45:03 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-01 17:31:10 -0400
commitee34e51a7458ba59af65d1b0eb9c7fa9d19a7586 (patch)
treeba7a01b130bce5c29b6c8fc7b56902b865bdf5a0 /drivers/usb/musb
parent622859634a663c5e55d0e2a2cdbb55ac058d97b3 (diff)
usb: musb: choose correct fifo_mode
When we start building glue layers as modules, we need to be careful with the fifo_mode changes otherwise that weird ifdeferry won't evaluate correctly. Add the missing _MODULE variants for all glue layers to prevent everybody from using fifo_mode 2. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r--drivers/usb/musb/musb_core.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 7ab949795589..391237b0dec1 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1010,10 +1010,15 @@ static void musb_shutdown(struct platform_device *pdev)
1010 * We don't currently use dynamic fifo setup capability to do anything 1010 * We don't currently use dynamic fifo setup capability to do anything
1011 * more than selecting one of a bunch of predefined configurations. 1011 * more than selecting one of a bunch of predefined configurations.
1012 */ 1012 */
1013#if defined(CONFIG_USB_MUSB_TUSB6010) || defined(CONFIG_USB_MUSB_OMAP2PLUS) \ 1013#if defined(CONFIG_USB_MUSB_TUSB6010) \
1014 || defined(CONFIG_USB_MUSB_AM35X) 1014 || defined(CONFIG_USB_MUSB_TUSB6010_MODULE) \
1015 || defined(CONFIG_USB_MUSB_OMAP2PLUS) \
1016 || defined(CONFIG_USB_MUSB_OMAP2PLUS_MODULE) \
1017 || defined(CONFIG_USB_MUSB_AM35X) \
1018 || defined(CONFIG_USB_MUSB_AM35X_MODULE)
1015static ushort __initdata fifo_mode = 4; 1019static ushort __initdata fifo_mode = 4;
1016#elif defined(CONFIG_USB_MUSB_UX500) 1020#elif defined(CONFIG_USB_MUSB_UX500) \
1021 || defined(CONFIG_USB_MUSB_UX500_MODULE)
1017static ushort __initdata fifo_mode = 5; 1022static ushort __initdata fifo_mode = 5;
1018#else 1023#else
1019static ushort __initdata fifo_mode = 2; 1024static ushort __initdata fifo_mode = 2;