diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 17:08:46 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 17:08:46 +0100 |
| commit | 004c1c7096659d352b83047a7593e91d8a30e3c5 (patch) | |
| tree | 2801e22e945d2ca6016383348e16583918164526 /drivers/usb/gadget | |
| parent | Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into dev... (diff) | |
| parent | ARM: Merge next-samsung-s3c2443-clock (diff) | |
| download | linux-004c1c7096659d352b83047a7593e91d8a30e3c5.tar.xz linux-004c1c7096659d352b83047a7593e91d8a30e3c5.zip | |
Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/s3c-hsotg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 5fc80a104150..9941fc613413 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c @@ -30,7 +30,7 @@ #include <plat/regs-usb-hsotg-phy.h> #include <plat/regs-usb-hsotg.h> -#include <plat/regs-sys.h> +#include <mach/regs-sys.h> #include <plat/udc-hs.h> #define DMA_ADDR_INVALID (~((dma_addr_t)0)) |