Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (9ebea382) · Commits · e / devices / android_kernel_sony_msm8994

MAINTAINERS

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1353,6 +1353,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath9k
	S: Supported		S: Supported
	F: drivers/net/wireless/ath/ath9k/		F: drivers/net/wireless/ath/ath9k/

			WILOCITY WIL6210 WIRELESS DRIVER
			M: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
			L: linux-wireless@vger.kernel.org
			L: wil6210@qca.qualcomm.com
			S: Supported
			W: http://wireless.kernel.org/en/users/Drivers/wil6210
			F: drivers/net/wireless/ath/wil6210/

	CARL9170 LINUX COMMUNITY WIRELESS DRIVER		CARL9170 LINUX COMMUNITY WIRELESS DRIVER
	M: Christian Lamparter <chunkeey@googlemail.com>		M: Christian Lamparter <chunkeey@googlemail.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org

drivers/bcma/Kconfig

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -67,8 +67,7 @@ config BCMA_DRIVER_GMAC_CMN

	config BCMA_DRIVER_GPIO		config BCMA_DRIVER_GPIO
	bool "BCMA GPIO driver"		bool "BCMA GPIO driver"
	depends on BCMA		depends on BCMA && GPIOLIB
	select GPIOLIB
	help		help
	Driver to provide access to the GPIO pins of the bcma bus.		Driver to provide access to the GPIO pins of the bcma bus.

drivers/bcma/driver_chipcommon_sflash.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@ static struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {
	{ "M25P40", 0x12, 0x10000, 8, },		{ "M25P40", 0x12, 0x10000, 8, },

	{ "M25P16", 0x14, 0x10000, 32, },		{ "M25P16", 0x14, 0x10000, 32, },
	{ "M25P32", 0x14, 0x10000, 64, },		{ "M25P32", 0x15, 0x10000, 64, },
	{ "M25P64", 0x16, 0x10000, 128, },		{ "M25P64", 0x16, 0x10000, 128, },
	{ "M25FL128", 0x17, 0x10000, 256, },		{ "M25FL128", 0x17, 0x10000, 256, },
	{ 0 },		{ 0 },

drivers/bluetooth/ath3k.c

+10 −0

drivers/bluetooth/btusb.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -77,10 +77,15 @@ static struct usb_device_id ath3k_table[] = {
	{ USB_DEVICE(0x0CF3, 0x311D) },		{ USB_DEVICE(0x0CF3, 0x311D) },
	{ USB_DEVICE(0x13d3, 0x3375) },		{ USB_DEVICE(0x13d3, 0x3375) },
	{ USB_DEVICE(0x04CA, 0x3005) },		{ USB_DEVICE(0x04CA, 0x3005) },
			{ USB_DEVICE(0x04CA, 0x3006) },
			{ USB_DEVICE(0x04CA, 0x3008) },
	{ USB_DEVICE(0x13d3, 0x3362) },		{ USB_DEVICE(0x13d3, 0x3362) },
	{ USB_DEVICE(0x0CF3, 0xE004) },		{ USB_DEVICE(0x0CF3, 0xE004) },
	{ USB_DEVICE(0x0930, 0x0219) },		{ USB_DEVICE(0x0930, 0x0219) },
	{ USB_DEVICE(0x0489, 0xe057) },		{ USB_DEVICE(0x0489, 0xe057) },
			{ USB_DEVICE(0x13d3, 0x3393) },
			{ USB_DEVICE(0x0489, 0xe04e) },
			{ USB_DEVICE(0x0489, 0xe056) },

	/* Atheros AR5BBU12 with sflash firmware */		/* Atheros AR5BBU12 with sflash firmware */
	{ USB_DEVICE(0x0489, 0xE02C) },		{ USB_DEVICE(0x0489, 0xE02C) },
	@@ -104,10 +109,15 @@ static struct usb_device_id ath3k_blist_tbl[] = {
	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	/* Atheros AR5BBU22 with sflash firmware */		/* Atheros AR5BBU22 with sflash firmware */
	{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },

Original line number	Original line	Diff line number	Diff line
	@@ -135,10 +135,15 @@ static struct usb_device_id blacklist_table[] = {
	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },		{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
			{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	/* Atheros AR5BBU12 with sflash firmware */		/* Atheros AR5BBU12 with sflash firmware */
	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },		{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },