diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
| commit | 67dadcb324c2fe059cb2c35f8b80df42bb23f7c4 (patch) | |
| tree | 3521a2a9e05a7de426ab50bc7685489ad6340e54 /drivers/usb | |
| parent | eb47f71200b7d5b4c8c1f8c75675f592d855aafd (diff) | |
| parent | e26a9e00afc482b971afcaef1db8c9034d4d6d7c (diff) | |
| download | linux-67dadcb324c2fe059cb2c35f8b80df42bb23f7c4.tar.bz2 | |
Merge commit 'e26a9e0' into stable/for-linus-3.15
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/lpc32xx_udc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/lpc32xx_udc.c index 049ebab0d360..a94bb10eeb03 100644 --- a/drivers/usb/gadget/lpc32xx_udc.c +++ b/drivers/usb/gadget/lpc32xx_udc.c @@ -55,7 +55,6 @@ #include <mach/hardware.h> #include <linux/io.h> #include <asm/irq.h> -#include <asm/system.h> #include <mach/platform.h> #include <mach/irqs.h> |