diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-06 19:55:42 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-06 19:55:42 +0100 |
| commit | 5f9251cb93237c9578160df9acc6ce9948ad8c52 (patch) | |
| tree | 5a5718b5a076ce6f04bb3d0e1691aa65d87cc8a8 /net/mac80211/led.c | |
| parent | net: add POLLPRI to sock_def_readable() (diff) | |
| parent | mac80211: remove stray extern (diff) | |
| download | linux-5f9251cb93237c9578160df9acc6ce9948ad8c52.tar.xz linux-5f9251cb93237c9578160df9acc6ce9948ad8c52.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/led.c')
| -rw-r--r-- | net/mac80211/led.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/led.c b/net/mac80211/led.c index 4905eb8af572..14590332c81c 100644 --- a/net/mac80211/led.c +++ b/net/mac80211/led.c @@ -215,8 +215,8 @@ static void tpt_trig_timer(unsigned long data) read_unlock(&tpt_trig->trig.leddev_list_lock); } -extern char *__ieee80211_create_tpt_led_trigger( - struct ieee80211_hw *hw, unsigned int flags, +char *__ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw, + unsigned int flags, const struct ieee80211_tpt_blink *blink_table, unsigned int blink_table_len) { |