diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-11 23:57:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-11 23:57:12 +0100 |
| commit | 782c686c537f17fd728569ea23b2e15e495606ff (patch) | |
| tree | a962c345d45acdebc8cc85df67e8450a93789132 /drivers | |
| parent | 1ea25901e64301ed16384f2d68a905d92e3e8697 (diff) | |
| parent | 3b5230b0de0897c971832147b20102ab242a14a5 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-usb' into linux-linaro-lsk
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 4150380df705..d44d43f293be 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -591,7 +591,7 @@ static int ehci_run (struct usb_hcd *hcd) */ hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params); if (HCC_64BIT_ADDR(hcc_params)) { -#if CONFIG_ARM64 +#ifdef CONFIG_ARM64 ehci_writel(ehci, ehci->periodic_dma >> 32, &ehci->regs->segment); /* * this is deeply broken on almost all architectures |