Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / rtl818x / rtl8187 / rfkill.c

diff --git a/drivers/net/wireless/rtl818x/rtl8187_rfkill.c b/drivers/net/wireless/rtl818x/rtl8187/rfkill.c
similarity index 98%
rename from drivers/net/wireless/rtl818x/rtl8187_rfkill.c
rename to drivers/net/wireless/rtl818x/rtl8187/rfkill.c
index 03555e1e0cab29cb0d8b4698b71d994d3ec11296..34116719974aff0a2bde712ca666438330f6ccbe 100644 (file)
--- a/drivers/net/wireless/rtl818x/rtl8187_rfkill.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/rfkill.c
@@ -18,7 +18,7 @@
 #include <net/mac80211.h>
 
 #include "rtl8187.h"
-#include "rtl8187_rfkill.h"
+#include "rfkill.h"
 
 static bool rtl8187_is_radio_enabled(struct rtl8187_priv *priv)
 {