Re: [PATCH] rt2x00: fixup some non-functional merge errors

[Ivo van Doorn <ivdoorn@gmail.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);
>  
>  	/*