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

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Browse Source 
Conflicts:
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/cpc-usb/TODO
	drivers/staging/cpc-usb/cpc-usb_drv.c
	drivers/staging/cpc-usb/cpc.h
	drivers/staging/cpc-usb/cpc_int.h
	drivers/staging/cpc-usb/cpcusb.h
This commit is contained in:
David S. Miller
2009-09-24 15:13:11 -07:00
parent 139d6065c8 94e0fb086f
commit 8b3f6af863
6498 changed files with 724877 additions and 342383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/zd1211rw/zd_chip.c
View File

@@ -368,7 +368,7 @@ error:
return r;
}
/* MAC address: if custom mac addresses are to to be used CR_MAC_ADDR_P1 and
/* MAC address: if custom mac addresses are to be used CR_MAC_ADDR_P1 and
* CR_MAC_ADDR_P2 must be overwritten
*/
int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)