iwlwifi: fix merge error

Browse source

This hunk of code was removed in patch "iwlwifi: do not
cancel delayed work inside spin_lock_irqsave" submitted at
http://marc.info/?l=linux-wireless&m=124267503030042&w=2

This same patch in this repo does not remove this hunk.
Remove it here.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

...

This commit is contained in:

Reinette Chatre 2009-05-22 14:37:54 -07:00 • committed by John W. Linville

parent ce2ebc9b8d

commit df29ff3794

1 changed files with 0 additions and 7 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

7

drivers/net/wireless/iwlwifi/iwl-core.c

View file