Hauke Mehrtens 28b4c3bf1c wireless: Fix merge. ... in your merge in 5c01d56693 you added "int i;" into wl1271_main.c which is unused in that function. This patch fixes the merge problem: Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: David S. Miller <davem@davemloft.net>		2010-04-28 14:23:15 -07:00
..
Kconfig
Makefile
wl12xx_80211.h
wl1251.h
wl1251_acx.c
wl1251_acx.h
wl1251_boot.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1251_boot.h
wl1251_cmd.c
wl1251_cmd.h
wl1251_debugfs.c
wl1251_debugfs.h
wl1251_event.c
wl1251_event.h
wl1251_init.c
wl1251_init.h
wl1251_io.c
wl1251_io.h
wl1251_main.c	Merge branch 'master' into for-davem	2010-04-23 14:43:45 -04:00
wl1251_ps.c
wl1251_ps.h
wl1251_reg.h	wl1251: read default MAC address from EEPROM when available	2010-04-16 15:32:00 -04:00
wl1251_rx.c
wl1251_rx.h
wl1251_sdio.c	wl1251: add support for dedicated IRQ line	2010-04-16 15:47:14 -04:00
wl1251_spi.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-04-15 16:21:34 -04:00
wl1251_spi.h
wl1251_tx.c
wl1251_tx.h
wl1271.h	wl1271: Add support for connection quality monitoring	2010-04-09 13:43:11 -04:00
wl1271_acx.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-04-15 16:21:34 -04:00
wl1271_acx.h	wl1271: Add support for connection quality monitoring	2010-04-09 13:43:11 -04:00
wl1271_boot.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-04-15 16:21:34 -04:00
wl1271_boot.h
wl1271_cmd.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-04-15 16:21:34 -04:00
wl1271_cmd.h	wl1271: Configure rates for templates	2010-04-06 16:55:13 -04:00
wl1271_conf.h	wl1271: Add support for connection quality monitoring	2010-04-09 13:43:11 -04:00
wl1271_debugfs.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1271_debugfs.h
wl1271_event.c	wl1271: Add support for connection quality monitoring	2010-04-09 13:43:11 -04:00
wl1271_event.h	wl1271: Add support for connection quality monitoring	2010-04-09 13:43:11 -04:00
wl1271_init.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-04-15 16:21:34 -04:00
wl1271_init.h
wl1271_io.c
wl1271_io.h
wl1271_main.c	wireless: Fix merge.	2010-04-28 14:23:15 -07:00
wl1271_ps.c	wl1271: Go to ELP in idle	2010-04-09 13:43:10 -04:00
wl1271_ps.h
wl1271_reg.h
wl1271_rx.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-04-15 16:21:34 -04:00
wl1271_rx.h
wl1271_sdio.c	wl1271: fix sdio driver name in wl1271_sdio_driver	2010-04-06 16:55:11 -04:00
wl1271_spi.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-04-15 16:21:34 -04:00
wl1271_testmode.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1271_testmode.h
wl1271_tx.c	wl1271: Fix tx queue flushing	2010-04-06 16:55:14 -04:00
wl1271_tx.h	wl1271: Use minimum rate for each band for control messages	2010-04-06 16:55:12 -04:00