Merge branch 'for-davem' of... (9cf8d1a3) · Commits · 戴 / test

Documentation/feature-removal-schedule.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -564,3 +564,12 @@ Who: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

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

		What: iwlwifi disable_hw_scan module parameters
		When: 2.6.40
		Why: Hareware scan is the prefer method for iwlwifi devices for
		scanning operation. Remove software scan support for all the
		iwlwifi devices.

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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -6457,7 +6457,7 @@ WL1271 WIRELESS DRIVER
		M: Luciano Coelho <luciano.coelho@nokia.com>
		L: linux-wireless@vger.kernel.org
		W: http://wireless.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
		S: Maintained
		F: drivers/net/wireless/wl12xx/wl1271*
		F: include/linux/wl12xx.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
		{
		.name = "wl1271",
		.mmc = 3,
		.wires = 4,
		.caps = MMC_CAP_4_BIT_DATA,
		.gpio_wp = -EINVAL,
		.gpio_cd = -EINVAL,
		.nonremovable = true,

+0 −2

Original line number	Diff line number	Diff line
		@@ -54,8 +54,6 @@ MODULE_AUTHOR("Christian Lamparter <chunkeey@web.de>");
		MODULE_LICENSE("GPL");
		MODULE_DESCRIPTION("Atheros AR9170 802.11n USB wireless");
		MODULE_FIRMWARE("ar9170.fw");
		MODULE_FIRMWARE("ar9170-1.fw");
		MODULE_FIRMWARE("ar9170-2.fw");

		enum ar9170_requirements {
		AR9170_REQ_FW1_ONLY = 1,

+1 −4

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ static const u8 ath_bcast_mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

		struct ath_ani {
		bool caldone;
		int16_t noise_floor;
		unsigned int longcal_timer;
		unsigned int shortcal_timer;
		unsigned int resetcal_timer;
		@@ -103,14 +102,12 @@ enum ath_cipher {
		* @read: Register read
		* @write: Register write
		* @enable_write_buffer: Enable multiple register writes
		* @disable_write_buffer: Disable multiple register writes
		* @write_flush: Flush buffered register writes
		* @write_flush: flush buffered register writes and disable buffering
		*/
		struct ath_ops {
		unsigned int (read)(void , u32 reg_offset);
		void (write)(void , u32 val, u32 reg_offset);
		void (enable_write_buffer)(void );
		void (disable_write_buffer)(void );
		void (write_flush) (void );
		};