diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2009-11-16 23:35:38 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 12:23:20 -0800 |
| commit | ad988ba5c024ef5c96eed0387ff37e63b8c9f7e0 (patch) | |
| tree | a3eb3f4a89a9a68916034eb65ad7512bc6b81ef9 /drivers/staging/Makefile | |
| parent | 8eee44dafdaaafaa0623c3ceaf4e507403365311 (diff) | |
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>
Diffstat (limited to 'drivers/staging/Makefile')
| -rw-r--r-- | drivers/staging/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 3c6135b4126..edae7d681e6 100644 --- 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/ |