diff options
author | Avinash Kumar <avinash.kumar@stericsson.com> | 2011-09-19 15:36:01 +0530 |
---|---|---|
committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:58:05 +0200 |
commit | fe44f6a8d0ae31973d35cb34f3723ca8900e2b64 (patch) | |
tree | 1855689e31bdaefdbf4c49acfe7a3bff1bd18705 /include | |
parent | 2a11872f6a5753053d3a7301830852ebb34db9da (diff) |
usb:Migrate the patches to kernel 3.0
Following patches for usb driver are manually merged to kernel 3.0
d11e52a ux500: usb: add usb device mode support on u5500
1fecc55 ux500: usb: enabling adb and ACM functionality in u5500_defconfig
2847bf4 ux500: usb: error handling in musb for u5500
37f22da ux500: usb: U5500 v2 update
e1b079d ux500: usb: Fix for enumeration when ON with cable
181701a ux500: usb: Fix for V2 emmc2 boot USB device issue
3a60721 mach-ux500: Handle the LinkStatus register.
086a83e usb: ux500: usb gpio enable/disable in pair
ST-Ericsson ID: 352334
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: NA
Change-Id: Id918b9a55d3b85faf7c003547748f17086af3ec7
Signed-off-by: Avinash Kumar <avinash.kumar@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30860
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mfd/abx500/ab5500.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/abx500/ab5500.h b/include/linux/mfd/abx500/ab5500.h index 148f88fa8dd..3a35f2d4b52 100644 --- a/include/linux/mfd/abx500/ab5500.h +++ b/include/linux/mfd/abx500/ab5500.h @@ -156,6 +156,7 @@ struct ab5500_platform_data { unsigned int init_settings_sz; bool pm_power_off; struct ab5500_regulator_platform_data *regulator; + struct ab5500_usbgpio_platform_data *usb; }; struct ab5500_ponkey_platform_data { |