Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22c7fdf4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 5423b2ed 86b89eed

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -720,6 +720,15 @@ L: linux-wireless@vger.kernel.org 
L:	ath5k-devel@lists.ath5k.org

S:	Maintained



ATHEROS ATH9K WIRELESS DRIVER

P:	Luis R. Rodriguez

M:	lrodriguez@atheros.com

P:	Jouni Malinen

M:	jmalinen@atheros.com

L:	linux-wireless@vger.kernel.org

L:	ath9k-devel@lists.ath9k.org

S:	Supported



ATI_REMOTE2 DRIVER

P:	Ville Syrjala

M:	syrjala@sci.fi

drivers/dma/ioat_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ static dma_cookie_t ioat1_tx_submit(struct dma_async_tx_descriptor *tx) 
	/* write address into NextDescriptor field of last desc in chain */

	to_ioat_desc(ioat_chan->used_desc.prev)->hw->next =

							first->async_tx.phys;

	__list_splice(&new_chain, ioat_chan->used_desc.prev);

	list_splice_tail(&new_chain, &ioat_chan->used_desc);



	ioat_chan->dmacount += desc_count;

	ioat_chan->pending += desc_count;

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -695,6 +695,7 @@ config MAC80211_HWSIM 


source "drivers/net/wireless/p54/Kconfig"

source "drivers/net/wireless/ath5k/Kconfig"

source "drivers/net/wireless/ath9k/Kconfig"

source "drivers/net/wireless/iwlwifi/Kconfig"

source "drivers/net/wireless/hostap/Kconfig"

source "drivers/net/wireless/b43/Kconfig"

drivers/net/wireless/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -62,5 +62,6 @@ obj-$(CONFIG_RT2X00) += rt2x00/ 
obj-$(CONFIG_P54_COMMON)	+= p54/



obj-$(CONFIG_ATH5K)	+= ath5k/

obj-$(CONFIG_ATH9K)	+= ath9k/



obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o

drivers/net/wireless/ath5k/base.c

+0 −2
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ static struct pci_device_id ath5k_pci_id_table[] __devinitdata = { 
	{ PCI_VDEVICE(ATHEROS, 0x001a), .driver_data = AR5K_AR5212 }, /* 2413 Griffin-lite */

	{ PCI_VDEVICE(ATHEROS, 0x001b), .driver_data = AR5K_AR5212 }, /* 5413 Eagle */

	{ PCI_VDEVICE(ATHEROS, 0x001c), .driver_data = AR5K_AR5212 }, /* 5424 Condor (PCI-E)*/

	{ PCI_VDEVICE(ATHEROS, 0x0023), .driver_data = AR5K_AR5212 }, /* 5416 */

	{ PCI_VDEVICE(ATHEROS, 0x0024), .driver_data = AR5K_AR5212 }, /* 5418 */

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, ath5k_pci_id_table);