Staging: rtl8187se: Rename staging driver to avoid name conflict with mainline driver

Now that active development has begun on a mainline version of
a driver for the RTL8187SE that should be called rtl8187se, there
is a conflict with the driver in staging with the same name.

To solve the conflict, rename the driver in staging to r8187se.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 3c6135b4126cea8873b2516c9b5afdfd353455c0..edae7d681e6e827f3e3cf24f31dc4a766bcce04e 100644 (file)
--- a/drivers/staging/Makefile
+++ b/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/drivers/staging/rtl8187se/Kconfig b/drivers/staging/rtl8187se/Kconfig
index 3211dd3765a094b43ad876397962841e9fa96877..e24a6f7a0d859691534210f5cab918918ec089ca 100644 (file)
--- a/drivers/staging/rtl8187se/Kconfig
+++ b/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/drivers/staging/rtl8187se/Makefile b/drivers/staging/rtl8187se/Makefile
index ac35cffe5d4a0e6abe6f3aec7882ea3bdb197d60..b395acf5a38e5a9ac29025633c694167e5b768c0 100644 (file)
--- a/drivers/staging/rtl8187se/Makefile
+++ b/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