Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40262275 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'extcon-for-3.9' of... 

Merge tag 'extcon-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/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
parents 19d3243e af5eb1a1

drivers/extcon/extcon-max77693.c

+1 −1
Original line number Diff line number Diff line
@@ -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",