diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-01-13 13:57:45 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-01-13 13:57:45 +0200 |
| commit | a0afd4f7c1ff8cb7a9747150500f8ce081fbcfc9 (patch) | |
| tree | 12d6c61b17e3b3b9874b9a0d1063e711af483b02 /drivers/net/wireless/ath/ath6kl/sdio.c | |
| parent | e80ec84d9352419a7c0482edfbf1b96eaa4c8b95 (diff) | |
| parent | a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 (diff) | |
| download | linux-rt-a0afd4f7c1ff8cb7a9747150500f8ce081fbcfc9.tar.gz | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/usb.c
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/sdio.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/sdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c index 50b19d3aefa7..662b47dc71e5 100644 --- a/drivers/net/wireless/ath/ath6kl/sdio.c +++ b/drivers/net/wireless/ath/ath6kl/sdio.c @@ -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, |