Commit ad988ba5 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman

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: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8eee44da
...@@ -19,7 +19,7 @@ obj-$(CONFIG_COMEDI) += comedi/ ...@@ -19,7 +19,7 @@ obj-$(CONFIG_COMEDI) += comedi/
obj-$(CONFIG_ASUS_OLED) += asus_oled/ obj-$(CONFIG_ASUS_OLED) += asus_oled/
obj-$(CONFIG_PANEL) += panel/ obj-$(CONFIG_PANEL) += panel/
obj-$(CONFIG_ALTERA_PCIE_CHDMA) += altpciechdma/ obj-$(CONFIG_ALTERA_PCIE_CHDMA) += altpciechdma/
obj-$(CONFIG_RTL8187SE) += rtl8187se/ obj-$(CONFIG_R8187SE) += rtl8187se/
obj-$(CONFIG_RTL8192SU) += rtl8192su/ obj-$(CONFIG_RTL8192SU) += rtl8192su/
obj-$(CONFIG_RTL8192E) += rtl8192e/ obj-$(CONFIG_RTL8192E) += rtl8192e/
obj-$(CONFIG_INPUT_MIMIO) += mimio/ obj-$(CONFIG_INPUT_MIMIO) += mimio/
......
config RTL8187SE config R8187SE
tristate "RealTek RTL8187SE Wireless LAN NIC driver" tristate "RealTek RTL8187SE Wireless LAN NIC driver"
depends on PCI && WLAN depends on PCI && WLAN
select WIRELESS_EXT select WIRELESS_EXT
select WEXT_PRIV select WEXT_PRIV
default N default N
---help--- ---help---
If built as a module, it will be called r8187se.ko.
...@@ -16,7 +16,7 @@ EXTRA_CFLAGS += -DENABLE_LPS ...@@ -16,7 +16,7 @@ EXTRA_CFLAGS += -DENABLE_LPS
#EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y #EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y
rtl8187se-objs := \ r8187se-objs := \
r8180_core.o \ r8180_core.o \
r8180_93cx6.o \ r8180_93cx6.o \
r8180_wx.o \ r8180_wx.o \
...@@ -35,5 +35,5 @@ rtl8187se-objs := \ ...@@ -35,5 +35,5 @@ rtl8187se-objs := \
ieee80211/ieee80211_crypt_ccmp.o \ ieee80211/ieee80211_crypt_ccmp.o \
ieee80211/ieee80211_crypt_wep.o ieee80211/ieee80211_crypt_wep.o
obj-$(CONFIG_RTL8187SE) += rtl8187se.o obj-$(CONFIG_R8187SE) += r8187se.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment