Skip to content

Commit

Permalink
Merge tag 'extcon-for-3.9' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/git/chanwoo/extcon into char-misc-next

Chanwoo writes:
	extcon: updates for v3.9

	This patchset add a few new feature of extcon-max8997
	and fix minor issue of extcon-max8997/77693.

	Update extcon-max8997 driver
	- Consolidate duplicate code
	- Set default uart/usb path for internal line of muic device
	- Set default ADC debounce time
	- Use wq to check cable state after certain delay
	- Code clean to move defined constant to header file
	- Make max8997_extcon_cable static

	Update extcon-max77693 driver
	- Make max77693_extcon_cable static
  • Loading branch information
Greg Kroah-Hartman committed Feb 13, 2013
2 parents 19d3243 + af5eb1a commit 4026227
Show file tree
Hide file tree
Showing 4 changed files with 567 additions and 252 deletions.
2 changes: 1 addition & 1 deletion drivers/extcon/extcon-max77693.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ enum {
_EXTCON_CABLE_NUM,
};

const char *max77693_extcon_cable[] = {
static const char *max77693_extcon_cable[] = {
[EXTCON_CABLE_USB] = "USB",
[EXTCON_CABLE_USB_HOST] = "USB-Host",
[EXTCON_CABLE_TA] = "TA",
Expand Down
Loading

0 comments on commit 4026227

Please sign in to comment.