diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-25 23:26:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-25 23:26:21 -0800 |
| commit | 19bc291c99f018bd4f2c38bbf69144086dca903f (patch) | |
| tree | 9d3cf9bc0c5a78e363dc0547da8bcd1e7c394265 /drivers/net/wireless/rtl818x | |
| parent | 04488734806948624dabc4514f96f14cd75b9a50 (diff) | |
| parent | 4a6967b88af02eebeedfbb91bc09160750225bb5 (diff) | |
| download | talos-obmc-linux-19bc291c99f018bd4f2c38bbf69144086dca903f.tar.gz talos-obmc-linux-19bc291c99f018bd4f2c38bbf69144086dca903f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/rt2x00/rt2800pci.c
Diffstat (limited to 'drivers/net/wireless/rtl818x')
| -rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187_leds.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187_leds.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8187_leds.c b/drivers/net/wireless/rtl818x/rtl8187_leds.c index f82aa8b4bdde..4637337d5ce6 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_leds.c +++ b/drivers/net/wireless/rtl818x/rtl8187_leds.c @@ -241,5 +241,5 @@ void rtl8187_leds_exit(struct ieee80211_hw *dev) cancel_delayed_work_sync(&priv->led_off); cancel_delayed_work_sync(&priv->led_on); } -#endif /* def CONFIG_RTL8187_LED */ +#endif /* def CONFIG_RTL8187_LEDS */ diff --git a/drivers/net/wireless/rtl818x/rtl8187_leds.h b/drivers/net/wireless/rtl818x/rtl8187_leds.h index efe8041bdda4..d743c96d4a20 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_leds.h +++ b/drivers/net/wireless/rtl818x/rtl8187_leds.h @@ -54,6 +54,6 @@ struct rtl8187_led { void rtl8187_leds_init(struct ieee80211_hw *dev, u16 code); void rtl8187_leds_exit(struct ieee80211_hw *dev); -#endif /* def CONFIG_RTL8187_LED */ +#endif /* def CONFIG_RTL8187_LEDS */ #endif /* RTL8187_LED_H */ |
