diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-01-21 01:35:23 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-01-21 01:35:23 +0100 |
| commit | 277568344c9a90c6c56ab436f133b16e4fdfd9fa (patch) | |
| tree | a4516d41ad6f791bd1932b290e65ed5292f45e89 /drivers/net/wireless/ath/ath9k/ahb.c | |
| parent | 68e6d7d60c0b35990cb8056e317ba97f0fe73047 (diff) | |
| download | kernel_samsung_smdk4412-277568344c9a90c6c56ab436f133b16e4fdfd9fa.zip kernel_samsung_smdk4412-277568344c9a90c6c56ab436f133b16e4fdfd9fa.tar.gz kernel_samsung_smdk4412-277568344c9a90c6c56ab436f133b16e4fdfd9fa.tar.bz2 | |
Backport ath from 3.4 kernel
net/wireless and mac80211 are already backported from a 3.4 kernel, so
it makes sense to also get ath from 3.4 (3.4.113).
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ahb.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ahb.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c index 5b49cd0..5e47ca6 100644 --- a/drivers/net/wireless/ath/ath9k/ahb.c +++ b/drivers/net/wireless/ath/ath9k/ahb.c @@ -19,6 +19,7 @@ #include <linux/nl80211.h> #include <linux/platform_device.h> #include <linux/ath9k_platform.h> +#include <linux/module.h> #include "ath9k.h" static const struct platform_device_id ath9k_platform_id_table[] = { @@ -27,6 +28,10 @@ static const struct platform_device_id ath9k_platform_id_table[] = { .driver_data = AR5416_AR9100_DEVID, }, { + .name = "ar933x_wmac", + .driver_data = AR9300_DEVID_AR9330, + }, + { .name = "ar934x_wmac", .driver_data = AR9300_DEVID_AR9340, }, @@ -129,7 +134,7 @@ static int ath_ahb_probe(struct platform_device *pdev) goto err_free_hw; } - ret = ath9k_init_device(id->driver_data, sc, 0x0, &ath_ahb_bus_ops); + ret = ath9k_init_device(id->driver_data, sc, &ath_ahb_bus_ops); if (ret) { dev_err(&pdev->dev, "failed to initialize device\n"); goto err_irq; |