diff options
author | Olof Johansson <olof@lixom.net> | 2013-04-18 08:54:41 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-18 08:54:41 +0200 |
commit | 1556f4b4d0abadb5df5e7678cbe7c30d27e7256c (patch) | |
tree | e8a8cebb7fba68c15525bad47f605935e97045b2 /arch/arm/mach-davinci/usb.c | |
parent | Merge tag 'boards-3.10' of git://git.infradead.org/users/jcooper/linux into n... (diff) | |
parent | ARM: davinci: da850 evm: fix const qualifier placement (diff) | |
download | linux-1556f4b4d0abadb5df5e7678cbe7c30d27e7256c.tar.xz linux-1556f4b4d0abadb5df5e7678cbe7c30d27e7256c.zip |
Merge tag 'davinci-for-v3.10/board-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/boards
From Sekhar Nori:
v3.10 board updates for DaVinci
This set of patches enables remoteproc support
on DA850 EVM and fixes some sparse warnings for
the same board.
* tag 'davinci-for-v3.10/board-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: da850 evm: fix const qualifier placement
ARM: davinci: da850 board: add remoteproc support
ARM: davinci: ensure global variables are declared
ARM: davinci: sram.c: fix incorrect type in assignment
ARM: davinci: da8xx dt: make file local symbols static
ARM: davinci: da8xx: add remoteproc support
ARM: davinci: remove test for undefined Kconfig macro
ARM: davinci: mmc: derive version information from device name
ARM: davinci: da850: add ECAP & EHRPWM clock nodes
ARM: davinci: clk framework support for enable/disable functionality
Diffstat (limited to 'arch/arm/mach-davinci/usb.c')
-rw-r--r-- | arch/arm/mach-davinci/usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index 5764d65ca25d..b0a6b522575f 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -10,6 +10,7 @@ #include <mach/common.h> #include <mach/irqs.h> #include <mach/cputype.h> +#include <mach/da8xx.h> #include <linux/platform_data/usb-davinci.h> #define DAVINCI_USB_OTG_BASE 0x01c64000 |