iwlwifi: pcie: fix merge damage

Browse source

The merge b35c8097 seems to have lost commit eabc4ac5d,
put the code back.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

...

This commit is contained in:

Johannes Berg 2013-09-30 11:02:46 +02:00 • committed by John W. Linville

parent 772eb43335

commit d819c6cf1c

1 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

drivers/net/wireless/iwlwifi/pcie/trans.c

View file