Re: [PATCH] staging: rtl8187se: Rename staging driver to avoid name conflict with mainline driver

[Gábor Stefanik]

On Mon, Nov 16, 2009 at 3:57 PM, Larry Finger <Larry.Finger@xxxxxxxxxxxx> wrote:
> 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 rtl8187se_stage.
>
> Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
> ---
>
> Index: wireless-testing/drivers/staging/Makefile
> ===================================================================
> --- wireless-testing.orig/drivers/staging/Makefile
> +++ wireless-testing/drivers/staging/Makefile
> @@ -20,7 +20,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_RTL8187SE_STAGE)  += rtl8187se/
>  obj-$(CONFIG_RTL8192SU)                += rtl8192su/
>  obj-$(CONFIG_RTL8192E)         += rtl8192e/
>  obj-$(CONFIG_INPUT_MIMIO)      += mimio/
> Index: wireless-testing/drivers/staging/rtl8187se/Kconfig
> ===================================================================
> --- wireless-testing.orig/drivers/staging/rtl8187se/Kconfig
> +++ wireless-testing/drivers/staging/rtl8187se/Kconfig
> @@ -1,4 +1,4 @@
> -config RTL8187SE
> +config RTL8187SE_STAGE
>        tristate "RealTek RTL8187SE Wireless LAN NIC driver"
>        depends on PCI && WLAN
>        select WIRELESS_EXT
> Index: wireless-testing/drivers/staging/rtl8187se/Makefile
> ===================================================================
> --- wireless-testing.orig/drivers/staging/rtl8187se/Makefile
> +++ wireless-testing/drivers/staging/rtl8187se/Makefile
> @@ -16,7 +16,7 @@ EXTRA_CFLAGS += -DENABLE_LPS
>
>  #EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y
>
> -rtl8187se-objs :=                      \
> +rtl8187se_stage-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_RTL8187SE_STAGE)  += rtl8187se_stage.o

Please make this r8187se.o, to be consistent with the other
r8180-sa2400 derivative drivers.

>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>



-- 
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/