Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / ath / ath9k / htc_hst.c

diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index 861ec92693096d07bfca64d4a16e0076fa390ce6..c41ab8c301617d11279c7f1bf4f6739aa5216e1d 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -462,9 +462,10 @@ void ath9k_htc_hw_free(struct htc_target *htc)
 }
 
 int ath9k_htc_hw_init(struct htc_target *target,
-                     struct device *dev, u16 devid, char *product)
+                     struct device *dev, u16 devid,
+                     char *product, u32 drv_info)
 {
-       if (ath9k_htc_probe_device(target, dev, devid, product)) {
+       if (ath9k_htc_probe_device(target, dev, devid, product, drv_info)) {
                printk(KERN_ERR "Failed to initialize the device\n");
                return -ENODEV;
        }