diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-11 22:21:51 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-11 22:21:51 -0700 |
| commit | eb9eef616b0ce14d554f75da197c0bfee8d2132f (patch) | |
| tree | 17c93adeb2d2f9317ae14a1f350282e06f504f30 | |
| parent | 86822f816fc9a42fd210e35d4881e988406497c0 (diff) | |
| parent | 19b08b33fa4c60d66d4e341d4d1d9a6e86ffc9e6 (diff) | |
| download | linux-3.10-eb9eef616b0ce14d554f75da197c0bfee8d2132f.tar.gz linux-3.10-eb9eef616b0ce14d554f75da197c0bfee8d2132f.tar.bz2 linux-3.10-eb9eef616b0ce14d554f75da197c0bfee8d2132f.zip | |
Merge branch 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
* 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: OTG integration: fix compiler warning
ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds
| -rw-r--r-- | arch/arm/mach-omap1/common.h | 4 | ||||
| -rw-r--r-- | arch/arm/plat-omap/usb.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h index 8cc616e6f54..bb7779b5779 100644 --- a/arch/arm/mach-omap1/common.h +++ b/arch/arm/mach-omap1/common.h @@ -67,6 +67,10 @@ extern bool omap_32k_timer_init(void); extern u32 omap_irq_flags; +#ifdef CONFIG_ARCH_OMAP16XX extern int ocpi_enable(void); +#else +static inline int ocpi_enable(void) { return 0; } +#endif #endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */ diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index 5db75619f21..daa0327381b 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c @@ -37,7 +37,6 @@ void __init omap_otg_init(struct omap_usb_config *config) { u32 syscon; - int status; int alt_pingroup = 0; /* NOTE: no bus or clock setup (yet?) */ @@ -102,6 +101,7 @@ omap_otg_init(struct omap_usb_config *config) #ifdef CONFIG_USB_GADGET_OMAP if (config->otg || config->register_dev) { struct platform_device *udc_device = config->udc_device; + int status; syscon &= ~DEV_IDLE_EN; udc_device->dev.platform_data = config; @@ -114,6 +114,7 @@ omap_otg_init(struct omap_usb_config *config) #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) if (config->otg || config->register_host) { struct platform_device *ohci_device = config->ohci_device; + int status; syscon &= ~HST_IDLE_EN; ohci_device->dev.platform_data = config; @@ -126,6 +127,7 @@ omap_otg_init(struct omap_usb_config *config) #ifdef CONFIG_USB_OTG if (config->otg) { struct platform_device *otg_device = config->otg_device; + int status; syscon &= ~OTG_IDLE_EN; otg_device->dev.platform_data = config; |