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

Merge remote branch 'wireless-next/master' into ath6kl-next

Browse Source 
Conflicts:
	drivers/net/wireless/ath/ath6kl/usb.c
This commit is contained in:
Kalle Valo
2012-01-13 13:57:45 +02:00
parent e80ec84d93 a8c1f65c79
commit a0afd4f7c1
3897 changed files with 109279 additions and 66721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath6kl/sdio.c
View File

@@ -1330,7 +1330,7 @@ static const struct sdio_device_id ath6kl_sdio_devices[] = {
MODULE_DEVICE_TABLE(sdio, ath6kl_sdio_devices);
static struct sdio_driver ath6kl_sdio_driver = {
.name = "ath6kl_sdio",
.name = "ath6kl",
.id_table = ath6kl_sdio_devices,
.probe = ath6kl_sdio_probe,
.remove = ath6kl_sdio_remove,