From: Ivo van Doorn <ivdoorn@gmail.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH] rt2x00: fixup some non-functional merge errors
Date: Fri, 28 Mar 2008 17:13:07 +0100 [thread overview]
Message-ID: <200803281713.07431.IvDoorn@gmail.com> (raw)
In-Reply-To: <1206662053-6237-1-git-send-email-linville@tuxdriver.com>
On Friday 28 March 2008, John W. Linville wrote:
> These small changes restore the rt2x00 sources to the way Ivo intended.
>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Thanks!
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
> ---
> drivers/net/wireless/rt2x00/rt2x00.h | 2 +-
> drivers/net/wireless/rt2x00/rt2x00dev.c | 4 ----
> 2 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 333484d..30f9f3a 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -674,7 +674,7 @@ struct rt2x00_dev {
> * This will only be compiled in when required.
> */
> #ifdef CONFIG_RT2X00_LIB_RFKILL
> -unsigned long rfkill_state;
> + unsigned long rfkill_state;
> #define RFKILL_STATE_ALLOCATED 1
> #define RFKILL_STATE_REGISTERED 2
> struct rfkill *rfkill;
> diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
> index f52e925..d2c0967 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
> @@ -1194,10 +1194,6 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
> */
> rt2x00debug_deregister(rt2x00dev);
> rt2x00rfkill_free(rt2x00dev);
> -
> - /*
> - * Free LED.
> - */
> rt2x00leds_unregister(rt2x00dev);
>
> /*
prev parent reply other threads:[~2008-03-28 16:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-27 23:54 [PATCH] rt2x00: fixup some non-functional merge errors John W. Linville
2008-03-28 16:13 ` Ivo van Doorn [this message]
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=200803281713.07431.IvDoorn@gmail.com \
--to=ivdoorn@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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;
as well as URLs for NNTP newsgroup(s).