summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/imx6_defconfig2
-rw-r--r--arch/arm/mach-mx6/usb_dr.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index b6fd6b6810a5..b58077b6a95b 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -1964,7 +1964,7 @@ CONFIG_USB_EHCI_ARC_OTG=y
# CONFIG_USB_EHCI_ARC_HSIC is not set
# CONFIG_USB_STATIC_IRAM is not set
CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_TT_NEWSCHED=y
# CONFIG_USB_EHCI_MXC is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_ISP116X_HCD is not set
diff --git a/arch/arm/mach-mx6/usb_dr.c b/arch/arm/mach-mx6/usb_dr.c
index c02158b4a2fc..40bb978ce0a9 100644
--- a/arch/arm/mach-mx6/usb_dr.c
+++ b/arch/arm/mach-mx6/usb_dr.c
@@ -519,7 +519,7 @@ static void _host_phy_lowpower_suspend(struct fsl_usb2_platform_data *pdata, boo
static void _host_wakeup_enable(struct fsl_usb2_platform_data *pdata, bool enable)
{
- void __iomem *phy_reg = MX6_IO_ADDRESS(USB_PHY0_BASE_ADDR);
+ void __iomem *phy_reg __maybe_unused = MX6_IO_ADDRESS(USB_PHY0_BASE_ADDR);
__wakeup_irq_enable(pdata, enable, ENABLED_BY_HOST);
#ifdef CONFIG_USB_OTG
if (enable) {