diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 08:26:35 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 08:26:35 +0100 |
| commit | feee830394cab4e697d2204da6d10a606619de3d (patch) | |
| tree | f2ba451f9ea9f05b21d0df9a4237bd01b711bcfc /drivers/w1 | |
| parent | ipack/devices/ipoctal: added shutdown callback (diff) | |
| parent | mfd: wm5102: Add microphone clamp control registers (diff) | |
| download | linux-feee830394cab4e697d2204da6d10a606619de3d.tar.xz linux-feee830394cab4e697d2204da6d10a606619de3d.zip | |
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 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/mxc_w1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index d338b56ea2f0..708a25fc9961 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c @@ -191,7 +191,7 @@ static struct platform_driver mxc_w1_driver = { .name = "mxc_w1", }, .probe = mxc_w1_probe, - .remove = __devexit_p(mxc_w1_remove), + .remove = mxc_w1_remove, }; module_platform_driver(mxc_w1_driver); |