Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

[~andy/linux] / drivers / net / wireless / ath / ath5k / base.c

diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 6396ad4bce67c8f005ec5373bd214e0d7c30712b..d85c312170bc7bd6c14d4f8f3add807bcc127417 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2549,7 +2549,6 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
        hw->wiphy->available_antennas_rx = 0x3;
 
        hw->extra_tx_headroom = 2;
-       hw->channel_change_time = 5000;
 
        /*
         * Mark the device as detached to avoid processing