summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-02-14 00:27:29 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2013-02-14 00:27:34 +0100
commit3ec3090cf14ec0920a5fbe976b5aafd6084db435 (patch)
tree516ad2f00670ddbe8a9a138c178d07260d1b44cf /include
parent0030f65481338df4213b995a4310e643652acb82 (diff)
parentab3f2a86d17c5c2c1127871d28d1f64baebc5d04 (diff)
downloadlinux-stable-3ec3090cf14ec0920a5fbe976b5aafd6084db435.tar.gz
linux-stable-3ec3090cf14ec0920a5fbe976b5aafd6084db435.tar.bz2
linux-stable-3ec3090cf14ec0920a5fbe976b5aafd6084db435.zip
Merge branch 'usbhost17-for-mfd' of git://github.com/rogerq/linux into for-next
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/platform_data/usb-omap.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_data/usb-omap.h b/include/linux/platform_data/usb-omap.h
index e697c85ad3bc..fa579b4c666b 100644
--- a/include/linux/platform_data/usb-omap.h
+++ b/include/linux/platform_data/usb-omap.h
@@ -55,6 +55,7 @@ struct ohci_hcd_omap_platform_data {
};
struct usbhs_omap_platform_data {
+ int nports;
enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS];
int reset_gpio_port[OMAP3_HS_USB_PORTS];
struct regulator *regulator[OMAP3_HS_USB_PORTS];