summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-11-18 11:37:20 +0100
committerFelipe Balbi <balbi@ti.com>2013-11-25 10:25:58 -0600
commitb144e4ab1ef130e8bf30bcd3e529b7f35112c503 (patch)
tree0538dc0bf91f4975e9cce53497a795af292064fa /drivers
parentd18f7116a5ddb8263fe62b05ad63e5ceb5875791 (diff)
downloadop-kernel-dev-b144e4ab1ef130e8bf30bcd3e529b7f35112c503.zip
op-kernel-dev-b144e4ab1ef130e8bf30bcd3e529b7f35112c503.tar.gz
usb: gadget: fix pxa25x compilation problems
In commit 88f718e3fa4d67f3a8dbe79a2f97d722323e4051 "ARM: pxa: delete the custom GPIO header" we removed the implicit inclusion of <mach/gpio.h> from <linux/gpio.h>. The pxa25x_udc was not using that, but it was relying on <linux/gpio.h> to implictly include <mach/gpio.h> which in turn implicitly included <mach/hardware.h>, which was needed for the driver to compile. Fix this up by explicitly including the necessary <mach/hardware.h> header. Reported-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/pxa25x_udc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 0ac6064..409a3c4 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -54,6 +54,7 @@
*/
#ifdef CONFIG_ARCH_PXA
#include <mach/pxa25x-udc.h>
+#include <mach/hardware.h>
#endif
#ifdef CONFIG_ARCH_LUBBOCK
OpenPOWER on IntegriCloud