diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-07-01 17:34:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-01 17:34:14 -0700 |
| commit | 05318bc905467237d4aa68a701f6e92a2b332218 (patch) | |
| tree | 3b7577383bca50aeb442568aa16cf8f2167b8694 /drivers/net/wireless/rtl818x | |
| parent | x86: Align skb w/ start of cacheline on newer core 2/Xeon Arch (diff) | |
| parent | ath9k_htc: Add LED support for AR7010 (diff) | |
| download | linux-dev-05318bc905467237d4aa68a701f6e92a2b332218.tar.xz linux-dev-05318bc905467237d4aa68a701f6e92a2b332218.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/libertas/host.h
Diffstat (limited to 'drivers/net/wireless/rtl818x')
| -rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c index 515817de2905..42705028751d 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c @@ -671,7 +671,7 @@ static u64 rtl8180_get_tsf(struct ieee80211_hw *dev) (u64)(rtl818x_ioread32(priv, &priv->map->TSFT[1])) << 32; } -void rtl8180_beacon_work(struct work_struct *work) +static void rtl8180_beacon_work(struct work_struct *work) { struct rtl8180_vif *vif_priv = container_of(work, struct rtl8180_vif, beacon_work.work); |