diff --git a/[refs] b/[refs]
index 7c327bb53d20..fba025c60fe2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0afd4f7c1ff8cb7a9747150500f8ce081fbcfc9
+refs/heads/master: d6f802612af55cc1b3699d119a04dfa2fc8812a0
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/main.c b/trunk/drivers/net/wireless/ath/ath6kl/main.c
index 0a6d6e2be6e9..3a3b2cc9940d 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/main.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/main.c
@@ -1021,7 +1021,8 @@ static struct net_device_stats *ath6kl_get_stats(struct net_device *dev)
 	return &vif->net_stats;
 }
 
-static int ath6kl_set_features(struct net_device *dev, u32 features)
+static int ath6kl_set_features(struct net_device *dev,
+			       netdev_features_t features)
 {
 	struct ath6kl_vif *vif = netdev_priv(dev);
 	struct ath6kl *ar = vif->ar;