From 052b2147776a369894a3e6bc019ffda055ad7177 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Mon, 16 Nov 2009 23:35:38 -0600
Subject: [PATCH] --- yaml --- r: 175240 b: refs/heads/master c:
 ad988ba5c024ef5c96eed0387ff37e63b8c9f7e0 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/Makefile           | 2 +-
 trunk/drivers/staging/rtl8187se/Kconfig  | 3 ++-
 trunk/drivers/staging/rtl8187se/Makefile | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bae5d1c7af14..c1d7b921cdb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8eee44dafdaaafaa0623c3ceaf4e507403365311
+refs/heads/master: ad988ba5c024ef5c96eed0387ff37e63b8c9f7e0
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
index 3c6135b4126c..edae7d681e6e 100644
--- a/trunk/drivers/staging/Makefile
+++ b/trunk/drivers/staging/Makefile
@@ -19,7 +19,7 @@ obj-$(CONFIG_COMEDI)		+= comedi/
 obj-$(CONFIG_ASUS_OLED)		+= asus_oled/
 obj-$(CONFIG_PANEL)		+= panel/
 obj-$(CONFIG_ALTERA_PCIE_CHDMA)	+= altpciechdma/
-obj-$(CONFIG_RTL8187SE)		+= rtl8187se/
+obj-$(CONFIG_R8187SE)		+= rtl8187se/
 obj-$(CONFIG_RTL8192SU)		+= rtl8192su/
 obj-$(CONFIG_RTL8192E)		+= rtl8192e/
 obj-$(CONFIG_INPUT_MIMIO)	+= mimio/
diff --git a/trunk/drivers/staging/rtl8187se/Kconfig b/trunk/drivers/staging/rtl8187se/Kconfig
index 3211dd3765a0..e24a6f7a0d85 100644
--- a/trunk/drivers/staging/rtl8187se/Kconfig
+++ b/trunk/drivers/staging/rtl8187se/Kconfig
@@ -1,7 +1,8 @@
-config RTL8187SE
+config R8187SE
 	tristate "RealTek RTL8187SE Wireless LAN NIC driver"
 	depends on PCI && WLAN
 	select WIRELESS_EXT
 	select WEXT_PRIV
 	default N
 	---help---
+	  If built as a module, it will be called r8187se.ko.
diff --git a/trunk/drivers/staging/rtl8187se/Makefile b/trunk/drivers/staging/rtl8187se/Makefile
index ac35cffe5d4a..b395acf5a38e 100644
--- a/trunk/drivers/staging/rtl8187se/Makefile
+++ b/trunk/drivers/staging/rtl8187se/Makefile
@@ -16,7 +16,7 @@ EXTRA_CFLAGS += -DENABLE_LPS
 
 #EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y
 
-rtl8187se-objs :=			\
+r8187se-objs :=			\
 		r8180_core.o		\
 		r8180_93cx6.o		\
 		r8180_wx.o		\
@@ -35,5 +35,5 @@ rtl8187se-objs :=			\
 		ieee80211/ieee80211_crypt_ccmp.o	\
 		ieee80211/ieee80211_crypt_wep.o
 
-obj-$(CONFIG_RTL8187SE)	+= rtl8187se.o
+obj-$(CONFIG_R8187SE)	+= r8187se.o