Merge branch 'master' of... (5c01d566) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/feature-removal-schedule.txt

+21 −1

Original line number	Original line	Diff line number	Diff line
	@@ -520,7 +520,6 @@ Who: Hans de Goede <hdegoede@redhat.com>

	----------------------------		----------------------------


	What: corgikbd, spitzkbd, tosakbd driver		What: corgikbd, spitzkbd, tosakbd driver
	When: 2.6.35		When: 2.6.35
	Files: drivers/input/keyboard/{corgi,spitz,tosa}kbd.c		Files: drivers/input/keyboard/{corgi,spitz,tosa}kbd.c
	@@ -608,3 +607,24 @@ Why: Useful in 2003, implementation is a hack.
	Generally invoked by accident today.		Generally invoked by accident today.
	Seen as doing more harm than good.		Seen as doing more harm than good.
	Who: Len Brown <len.brown@intel.com>		Who: Len Brown <len.brown@intel.com>

			----------------------------

			What: iwlwifi 50XX module parameters
			When: 2.6.40
			Why: The "..50" modules parameters were used to configure 5000 series and
			up devices; different set of module parameters also available for 4965
			with same functionalities. Consolidate both set into single place
			in drivers/net/wireless/iwlwifi/iwl-agn.c

			Who: Wey-Yi Guy <wey-yi.w.guy@intel.com>

			----------------------------

			What: iwl4965 alias support
			When: 2.6.40
			Why: Internal alias support has been present in module-init-tools for some
			time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed
			with no impact.

			Who: Wey-Yi Guy <wey-yi.w.guy@intel.com>

+1 −0

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -689,7 +689,8 @@ void ar9170_handle_command_response(struct ar9170 ar, void buf, u32 len)

	/* firmware debug */		/* firmware debug */
	case 0xca:		case 0xca:
	printk(KERN_DEBUG "ar9170 FW: %.s\n", len - 4, (char )buf + 4);		printk(KERN_DEBUG "ar9170 FW: %.*s\n", len - 4,
			(char *)buf + 4);
	break;		break;
	case 0xcb:		case 0xcb:
	len -= 4;		len -= 4;
	@@ -2512,7 +2513,7 @@ void *ar9170_alloc(size_t priv_size)
	* tends to split the streams into separate rx descriptors.		* tends to split the streams into separate rx descriptors.
	*/		*/

	skb = __dev_alloc_skb(AR9170_MAX_RX_BUFFER_SIZE, GFP_KERNEL);		skb = __dev_alloc_skb(AR9170_RX_STREAM_MAX_SIZE, GFP_KERNEL);
	if (!skb)		if (!skb)
	goto err_nomem;		goto err_nomem;

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,18 +67,28 @@ static struct usb_device_id ar9170_usb_ids[] = {
	{ USB_DEVICE(0x0cf3, 0x1001) },		{ USB_DEVICE(0x0cf3, 0x1001) },
	/* TP-Link TL-WN821N v2 */		/* TP-Link TL-WN821N v2 */
	{ USB_DEVICE(0x0cf3, 0x1002) },		{ USB_DEVICE(0x0cf3, 0x1002) },
			/* 3Com Dual Band 802.11n USB Adapter */
			{ USB_DEVICE(0x0cf3, 0x1010) },
			/* H3C Dual Band 802.11n USB Adapter */
			{ USB_DEVICE(0x0cf3, 0x1011) },
	/* Cace Airpcap NX */		/* Cace Airpcap NX */
	{ USB_DEVICE(0xcace, 0x0300) },		{ USB_DEVICE(0xcace, 0x0300) },
	/* D-Link DWA 160 A1 */		/* D-Link DWA 160 A1 */
	{ USB_DEVICE(0x07d1, 0x3c10) },		{ USB_DEVICE(0x07d1, 0x3c10) },
	/* D-Link DWA 160 A2 */		/* D-Link DWA 160 A2 */
	{ USB_DEVICE(0x07d1, 0x3a09) },		{ USB_DEVICE(0x07d1, 0x3a09) },
			/* Netgear WNA1000 */
			{ USB_DEVICE(0x0846, 0x9040) },
	/* Netgear WNDA3100 */		/* Netgear WNDA3100 */
	{ USB_DEVICE(0x0846, 0x9010) },		{ USB_DEVICE(0x0846, 0x9010) },
	/* Netgear WN111 v2 */		/* Netgear WN111 v2 */
	{ USB_DEVICE(0x0846, 0x9001) },		{ USB_DEVICE(0x0846, 0x9001) },
	/* Zydas ZD1221 */		/* Zydas ZD1221 */
	{ USB_DEVICE(0x0ace, 0x1221) },		{ USB_DEVICE(0x0ace, 0x1221) },
			/* Proxim ORiNOCO 802.11n USB */
			{ USB_DEVICE(0x1435, 0x0804) },
			/* WNC Generic 11n USB Dongle */
			{ USB_DEVICE(0x1435, 0x0326) },
	/* ZyXEL NWD271N */		/* ZyXEL NWD271N */
	{ USB_DEVICE(0x0586, 0x3417) },		{ USB_DEVICE(0x0586, 0x3417) },
	/* Z-Com UB81 BG */		/* Z-Com UB81 BG */

+10 −3

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,12 @@ enum ath_device_state {
	ATH_HW_INITIALIZED,		ATH_HW_INITIALIZED,
	};		};

			enum ath_bus_type {
			ATH_PCI,
			ATH_AHB,
			ATH_USB,
			};

	struct reg_dmn_pair_mapping {		struct reg_dmn_pair_mapping {
	u16 regDmnEnum;		u16 regDmnEnum;
	u16 reg_5ghz_ctl;		u16 reg_5ghz_ctl;
	@@ -73,6 +79,7 @@ struct ath_ops {
	struct ath_common;		struct ath_common;

	struct ath_bus_ops {		struct ath_bus_ops {
			enum ath_bus_type ath_bus_type;
	void (read_cachesize)(struct ath_common common, int *csz);		void (read_cachesize)(struct ath_common common, int *csz);
	bool (eeprom_read)(struct ath_common common, u32 off, u16 *data);		bool (eeprom_read)(struct ath_common common, u32 off, u16 *data);
	void (bt_coex_prep)(struct ath_common common);		void (bt_coex_prep)(struct ath_common common);