diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:28 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:28 +0800 |
| commit | 2e603f2fe80f061c2267e39775c3fbbc242257ae (patch) | |
| tree | b4b95dbf6ed95ffad62db187ffe54dead6ea5f57 /include/linux/mfd/abx500/ab8500.h | |
| parent | ce8fdbf6b69bcd0c80e9a4558c631c6fdbeedabc (diff) | |
| parent | 2b85348ec0be48a89fb2689bc59d943fbee8a625 (diff) | |
Merge topic branch 'usb' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'include/linux/mfd/abx500/ab8500.h')
| -rw-r--r-- | include/linux/mfd/abx500/ab8500.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h index 30435405c07..4aee57c9853 100644 --- a/include/linux/mfd/abx500/ab8500.h +++ b/include/linux/mfd/abx500/ab8500.h @@ -297,6 +297,7 @@ struct ab8500_platform_data { struct abx500_fg_platform_data *fg; struct abx500_chargalg_platform_data *chargalg; struct ab8500_gpio_platform_data *gpio; + struct abx500_usbgpio_platform_data *usb; struct ab8500_sysctrl_platform_data *sysctrl; struct ab8500_pwmled_platform_data *pwmled; }; |