ath9k: Store subsystem id in struct hw_version

This subsystem id will be used later to turn on the btcoex
support.

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 7dc6301..2ad7d02 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -119,7 +119,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
        sc->bus_ops = &ath_ahb_bus_ops;
        sc->irq = irq;
 
-       ret = ath_init_device(AR5416_AR9100_DEVID, sc);
+       ret = ath_init_device(AR5416_AR9100_DEVID, sc, 0x0);
        if (ret) {
                dev_err(&pdev->dev, "failed to initialize device\n");
                goto err_free_hw;

diff --cc drivers/net/wireless/ath/ath9k/ath9k.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/pci.c
Simple merge