diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-22 11:42:30 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-22 11:42:30 -0800 |
| commit | 958c025a2a1de40b8edb615b2d99a962c6c84019 (patch) | |
| tree | baa92dfc0d0a89635943d47d63f3adfa3fa377ca /drivers/usb | |
| parent | ddf20397eb1672bdbdc1d96d06f2f683ac76094f (diff) | |
| parent | ca594844e4a53f778811c06feef60bdf36bc5fec (diff) | |
| download | op-kernel-dev-958c025a2a1de40b8edb615b2d99a962c6c84019.zip op-kernel-dev-958c025a2a1de40b8edb615b2d99a962c6c84019.tar.gz | |
Merge branch 'at91/dt' into next/drivers
Merging at91/dt as a prereq for the at91/drivers code.
* at91/dt: (43 commits)
ARM: at91/at91rm9200ek.dts: rearrange nodes in address ascending order
ARM: at91: dt: at91rm9200ek: add emac and nor flash support
ARM: at91: add uart aliases to sama5d3 dtsi
ARM: at91: add i2c2 pinctrl speficifation to sama5d3 DT
ARM: at91: Animeo IP: fix mtd partition table
ARM: at91: at91sam9g45: add i2c pinctrl
ARM: at91: at91sam9g45: set default mmc pinctrl-names
ARM: at91: sama5d3: enable qt1070 as a wakeup source
ARM: at91: add support for Cosino board series by HCE Engineering
ARM: at91/dt/sama5d3: add DMA information to SHA/AES/TDES nodes
ARM: at91/dt/trivial: before sama5d3, Atmel MPU were using at91 prefix
ARM: at91/dt/trivial: use macro for AES irq type
ARM: at91: sam9263ek: add dt lcd support
ARM: at91: at9sam9m10g45ek: add dt lcd support
ARM: at91: sam9263: add fb dt support
ARM: at91: sam9g45: add fb dt support
ARM: at91/dt: binding: add missing compatibility string in SDRAM/DDR documentation
ARM: at91/dt: binding: add precision to AIC documentation
ARM: at91/dt: add atmel,pullup-gpio to at91rm9200ek usb1 definition
ARM: at91/dt: add ethernet phy to at91rm9200ek board
...
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/atmel_usba_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 2cb52e0..9f71d9f 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -326,7 +326,7 @@ static int vbus_is_present(struct usba_udc *udc) #if defined(CONFIG_ARCH_AT91SAM9RL) -#include <mach/at91_pmc.h> +#include <linux/clk/at91_pmc.h> static void toggle_bias(int is_on) { |
