Commit 3480a58a authored by John W. Linville's avatar John W. Linville
Browse files

rt2x00: fixup some non-functional merge errors 



These small changes restore the rt2x00 sources to the way Ivo intended.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 04850a47

drivers/net/wireless/rt2x00/rt2x00dev.c

+0 −4
Original line number Diff line number Diff line
@@ -1194,10 +1194,6 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) 
	 */

	rt2x00debug_deregister(rt2x00dev);

	rt2x00rfkill_free(rt2x00dev);



	/*

	 * Free LED.

	 */

	rt2x00leds_unregister(rt2x00dev);



	/*

drivers/net/wireless/rt2x00/rt2x00.h

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE