Merge branch 'topic/jack' into for-next

	tristate

	select SND_PCM

	select SND_VMASTER

	select SND_JACK

	select SND_JACK if INPUT=y || INPUT=SND

	select SND_HDA_CORE

config SND_HDA_INTEL

	  Set 1 to always enable the digital beep interface for HD-audio by

	  default.

config SND_HDA_INPUT_JACK

	bool "Support jack plugging notification via input layer"

	depends on INPUT=y || INPUT=SND

	select SND_JACK

	help

	  Say Y here to enable the jack plugging notification via

	  input layer.

config SND_HDA_PATCH_LOADER

	bool "Support initialization patch loading for HD-audio"

	select FW_LOADER

	unsigned long jackpoll_interval; /* In jiffies. Zero means no poll, rely on unsol events */

	struct delayed_work jackpoll_work;

#ifdef CONFIG_SND_HDA_INPUT_JACK

	/* jack detection */

	struct snd_array jacks;

#endif

	int depop_delay; /* depop delay in ms, -1 for default delay time */