diff options
| author | Felipe Balbi | 2011-06-29 11:45:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-07-01 23:31:10 +0200 |
| commit | ee34e51a7458ba59af65d1b0eb9c7fa9d19a7586 (patch) | |
| tree | ba7a01b130bce5c29b6c8fc7b56902b865bdf5a0 /drivers/usb/musb/musb_core.c | |
| parent | usb: musb: drop a gigantic amount of ifdeferry (diff) | |
| download | kernel-qcow2-linux-ee34e51a7458ba59af65d1b0eb9c7fa9d19a7586.tar.gz kernel-qcow2-linux-ee34e51a7458ba59af65d1b0eb9c7fa9d19a7586.tar.xz kernel-qcow2-linux-ee34e51a7458ba59af65d1b0eb9c7fa9d19a7586.zip | |
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/musb_core.c')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 11 |
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) * We don't currently use dynamic fifo setup capability to do anything * more than selecting one of a bunch of predefined configurations. */ -#if defined(CONFIG_USB_MUSB_TUSB6010) || defined(CONFIG_USB_MUSB_OMAP2PLUS) \ - || defined(CONFIG_USB_MUSB_AM35X) +#if defined(CONFIG_USB_MUSB_TUSB6010) \ + || defined(CONFIG_USB_MUSB_TUSB6010_MODULE) \ + || defined(CONFIG_USB_MUSB_OMAP2PLUS) \ + || defined(CONFIG_USB_MUSB_OMAP2PLUS_MODULE) \ + || defined(CONFIG_USB_MUSB_AM35X) \ + || defined(CONFIG_USB_MUSB_AM35X_MODULE) static ushort __initdata fifo_mode = 4; -#elif defined(CONFIG_USB_MUSB_UX500) +#elif defined(CONFIG_USB_MUSB_UX500) \ + || defined(CONFIG_USB_MUSB_UX500_MODULE) static ushort __initdata fifo_mode = 5; #else static ushort __initdata fifo_mode = 2; |