git.hungrycats.org Git - linux/commit

author	Johannes Berg <johannes.berg@intel.com>
	Tue, 22 Sep 2015 08:47:27 +0000 (10:47 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 9 Nov 2015 22:37:30 +0000 (14:37 -0800)
commit	74ca117328b38a74dd2a7c563200a8f1f2caa2b1
tree	faa551c82738ae3ff500904d336b4c4d1902f168	tree \| snapshot
parent	b33a7b4139431ecbdfc21fb41d1a6f9c6747deb1	commit \| diff

iwlwifi: fix firmware filename for 3160

commit b5a48134f8af08f5243328f8a0b05fc5ae7cf343 upstream.

The MODULE_FIRMWARE() for 3160 should be using the 7260 version as
it's done in the device configuration struct instead of referencing
IWL3160_UCODE_API_OK which doesn't even exist.

Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>