diff options
| author | Felipe Balbi <balbi@ti.com> | 2010-12-01 14:23:48 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2010-12-10 10:21:09 +0200 |
| commit | 7c925546427a0428b84bc5ba1f28b3698e492072 (patch) | |
| tree | 753685c16953aef4d8cdc148c7c2d1f9bd189fb0 /arch | |
| parent | 7421107b293cace2fc081731306d447ecd8517ab (diff) | |
| download | linux-7c925546427a0428b84bc5ba1f28b3698e492072.tar.bz2 | |
usb: musb: add Kconfig options for each glue layer
This will make things simpler when choosing which
glue layer to compile. It avoids a lot of magic
around the "default" Kconfig option and lets the
user choose what exactly s/he wants to compile.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/board-n8x0.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/usb-musb.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index e823c7042ab3..62e3ea007c76 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -46,8 +46,7 @@ static struct device *mmc_device; #define TUSB6010_GPIO_ENABLE 0 #define TUSB6010_DMACHAN 0x3f -#if defined(CONFIG_USB_TUSB6010) || \ - defined(CONFIG_USB_TUSB6010_MODULE) +#ifdef CONFIG_USB_MUSB_TUSB6010 /* * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and * 1.5 V voltage regulators of PM companion chip. Companion chip will then @@ -134,7 +133,7 @@ err: static void __init n8x0_usb_init(void) {} -#endif /*CONFIG_USB_TUSB6010 */ +#endif /*CONFIG_USB_MUSB_TUSB6010 */ static struct omap2_mcspi_device_config p54spi_mcspi_config = { diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 8dae0fa5905e..ed0e85c3764f 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c @@ -31,7 +31,7 @@ #include <mach/am35xx.h> #include <plat/usb.h> -#ifdef CONFIG_USB_MUSB_SOC +#if defined(CONFIG_USB_MUSB_OMAP2PLUS) || defined (CONFIG_USB_MUSB_AM35X) static struct resource musb_resources[] = { [0] = { /* start and end set dynamically */ |