diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 02:26:35 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 02:26:35 -0500 |
| commit | feee830394cab4e697d2204da6d10a606619de3d (patch) | |
| tree | f2ba451f9ea9f05b21d0df9a4237bd01b711bcfc /scripts/kernel-doc | |
| parent | e0f8d323f34dee3f47388dc3d87e7c428b077a0d (diff) | |
| parent | 689557d3c7045320958d5bc4141088f7b4dff7ba (diff) | |
Merge tag 'extcon-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
Chanwoo writes:
This is patch set of extcon for v3.9.
Update to max77693/max8997 extcon driver:
- Using MHL_TA cable for charging.
- Support JIG cable.
- Support Dock-Audio device for playing music and button of device.
- Support Dock-Smart device for desktop mode with mouse/keyboard.
- Set default UART/USB path on probe().
- Check the state/type of cable after completing initialization.
- Code clean to remove duplicate code and bug fix related to sequence of interrupt.
- Fix irq_flag of max8997/max77693 driver.
Update to arizona extcon driver:
- Headphone measurements.
- Alternative detection mechanism for non-default system designs.
- Microphone clamp integration.
- Support for additional detection pin.
- MICBIAS rise time configuration.
Diffstat (limited to 'scripts/kernel-doc')
| -rwxr-xr-x | scripts/kernel-doc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 28b761567815..f565536a2bef 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -2079,7 +2079,6 @@ sub dump_function($$) { | |||
| 2079 | $prototype =~ s/^__inline +//; | 2079 | $prototype =~ s/^__inline +//; |
| 2080 | $prototype =~ s/^__always_inline +//; | 2080 | $prototype =~ s/^__always_inline +//; |
| 2081 | $prototype =~ s/^noinline +//; | 2081 | $prototype =~ s/^noinline +//; |
| 2082 | $prototype =~ s/__devinit +//; | ||
| 2083 | $prototype =~ s/__init +//; | 2082 | $prototype =~ s/__init +//; |
| 2084 | $prototype =~ s/__init_or_module +//; | 2083 | $prototype =~ s/__init_or_module +//; |
| 2085 | $prototype =~ s/__must_check +//; | 2084 | $prototype =~ s/__must_check +//; |