xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:

	drivers/net/wireless/zd1211rw/zd_mac.h
	net/ieee80211/softmac/ieee80211softmac_assoc.c
This commit is contained in:
Jeff Garzik
2006-12-07 05:02:40 -05:00
parent 0efdf26266 720eeb4332
commit 359f2d17e3
21 changed files with 158 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ipw2100.c
View File

@@ -6220,7 +6220,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
/* Allocate and initialize the Tx/Rx queues and lists */
if (ipw2100_queues_allocate(priv)) {
printk(KERN_WARNING DRV_NAME
"Error calilng ipw2100_queues_allocate.\n");
"Error calling ipw2100_queues_allocate.\n");
err = -ENOMEM;
goto fail;
}