summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210/mach-goni.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-07 18:49:32 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-07 18:49:32 +0200
commit6a1e1d71d0bfb969f39a77eee585148aea57497b (patch)
treeaf8a151dc6b352f756f3bf6ac993678fcfb97502 /arch/arm/mach-s5pv210/mach-goni.c
parentMerge 3.4-rc6 into usb-next (diff)
parentusb:hsotg:samsung: err_irq: support for probe function (diff)
downloadlinux-6a1e1d71d0bfb969f39a77eee585148aea57497b.tar.xz
linux-6a1e1d71d0bfb969f39a77eee585148aea57497b.zip
Merge tag 'gadget-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
usb: gadget: patches for v3.5 This pull request is quite big, but mainly because there's a giant rework of the s3c_hsotg.c driver to make it friendlier for other users. Samsung Exynos platforms use the DesignWare Core USB2 IP from Synopsys so it's a bit unfair to have the driver work for Samsung platforms only. In short, the big rework is in preparation to make the driver more reusable. Another big rework in this pull request came from Ido, where he's removing the redundant pointer for the endpoint descriptor from the controller driver's own endpoint representation. The same pointer is available through the generic struct usb_ep structure. Also on this pull request is the conversion of a few extra controller drivers to the new style registration, which allows multiple controllers to be available on the same platform and helps remove global pointers from those drivers. Together with those big changes, there's the usual fixes and cleanups to gadget drivers. Nothing major.
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-goni.c')
-rw-r--r--arch/arm/mach-s5pv210/mach-goni.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 32395664e879..781fed689cd8 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -50,6 +50,7 @@
#include <plat/mfc.h>
#include <plat/regs-fb-v4.h>
#include <plat/camport.h>
+#include <linux/platform_data/s3c-hsotg.h>
#include <media/v4l2-mediabus.h>
#include <media/s5p_fimc.h>