From: "Gábor Stefanik" <netrolller.3d@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: [PATCH] staging: rtl8187se: Rename staging driver to avoid name conflict with mainline driver
Date: Mon, 16 Nov 2009 21:02:52 +0100 [thread overview]
Message-ID: <69e28c910911161202w5255bff5ydb7fc665b3320bda@mail.gmail.com> (raw)
In-Reply-To: <4b016848.3j3kclbqZ4ylyZGU%Larry.Finger@lwfinger.net>
On Mon, Nov 16, 2009 at 3:57 PM, Larry Finger <Larry.Finger@lwfinger.net> 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@lwfinger.net>
> ---
>
> 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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)
next prev parent reply other threads:[~2009-11-16 20:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-16 14:57 Larry Finger
2009-11-16 20:02 ` Gábor Stefanik [this message]
2009-11-16 22:09 ` Larry Finger
2009-11-16 22:22 ` John W. Linville
2009-11-17 0:17 ` Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=69e28c910911161202w5255bff5ydb7fc665b3320bda@mail.gmail.com \
--to=netrolller.3d@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®