diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-26 22:23:43 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-26 22:23:43 -0500 |
| commit | 786f949631c7d7dad6eae15659d29e78a5598662 (patch) | |
| tree | 4e11f5286705a88960fc2bb7a08d34550ed8fac0 /drivers/extcon/extcon-class.c | |
| parent | d8a60e000c951f845d9a5fb3e67853e0e63a5659 (diff) | |
| parent | 6594890020d505ddfab24a2dcd0b68b84628ed1e (diff) | |
Merge tag 'extcon-next-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
Chanwoo writes:
Update extcon for v3.20
This patchset fix minor issue of extcon driver.
Detailed description for patchset:
- Remove duplicate header file in extcon-class.c and add 'const' keyword for
array in extcon-max77693.c.
- Release iio channel when executing *_remove() function in extcon-adc-jack.c
Diffstat (limited to 'drivers/extcon/extcon-class.c')
| -rw-r--r-- | drivers/extcon/extcon-class.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c index 043dcd9946c9..8319f25b7145 100644 --- a/drivers/extcon/extcon-class.c +++ b/drivers/extcon/extcon-class.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/of.h> | 32 | #include <linux/of.h> |
| 33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
| 34 | #include <linux/sysfs.h> | 34 | #include <linux/sysfs.h> |
| 35 | #include <linux/of.h> | ||
| 36 | 35 | ||
| 37 | /* | 36 | /* |
| 38 | * extcon_cable_name suggests the standard cable names for commonly used | 37 | * extcon_cable_name suggests the standard cable names for commonly used |