diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 11:08:46 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 11:08:46 -0500 |
| commit | 004c1c7096659d352b83047a7593e91d8a30e3c5 (patch) | |
| tree | 2801e22e945d2ca6016383348e16583918164526 /drivers/usb | |
| parent | 882d01f96bc1909455696aae6eb7ce4df3e908c8 (diff) | |
| parent | 3b05007e43ea629394e89ea0b023d7b15375a2bb (diff) | |
Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable
Diffstat (limited to 'drivers/usb')
| -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 @@ | |||
| 30 | 30 | ||
| 31 | #include <plat/regs-usb-hsotg-phy.h> | 31 | #include <plat/regs-usb-hsotg-phy.h> |
| 32 | #include <plat/regs-usb-hsotg.h> | 32 | #include <plat/regs-usb-hsotg.h> |
| 33 | #include <plat/regs-sys.h> | 33 | #include <mach/regs-sys.h> |
| 34 | #include <plat/udc-hs.h> | 34 | #include <plat/udc-hs.h> |
| 35 | 35 | ||
| 36 | #define DMA_ADDR_INVALID (~((dma_addr_t)0)) | 36 | #define DMA_ADDR_INVALID (~((dma_addr_t)0)) |