diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-13 01:10:45 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-13 01:10:45 +0100 |
| commit | 9c7466b217af784280d9fc841bbd559ef3bf33e9 (patch) | |
| tree | c21ee243e48912201b4041fbf3f9bd9165603bd8 /drivers/usb/gadget/omap_udc.c | |
| parent | ARM: arm-soc: Merge branch 'next/clk' into next/pm (diff) | |
| parent | Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git:/... (diff) | |
| download | linux-9c7466b217af784280d9fc841bbd559ef3bf33e9.tar.xz linux-9c7466b217af784280d9fc841bbd559ef3bf33e9.zip | |
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
Another smaller branch merged into next/pm before pull request.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/usb/gadget/omap_udc.c')
| -rw-r--r-- | drivers/usb/gadget/omap_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 23afa06b65a4..1b8ddc3ddc50 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c @@ -44,7 +44,7 @@ #include <asm/unaligned.h> #include <asm/mach-types.h> -#include <plat-omap/dma-omap.h> +#include <linux/omap-dma.h> #include <mach/usb.h> |