]> bbs.cooldavid.org Git - net-next-2.6.git/commit
Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2
authorLarry Finger <Larry.Finger@lwfinger.net>
Mon, 7 Jun 2010 17:00:44 +0000 (12:00 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 30 Jun 2010 15:18:15 +0000 (08:18 -0700)
commitf84f927e081e16e1a4fcd92d28c3bc81c7b1864b
tree6047b45b367c5a6911f126b6e886dd0e2044995b
parentd268e0d28165340c3799a8a4944bc40f444f49fd
Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2

In commit bbfb5652, the spacing in the definitions of eqMacAddr and cpMacAddr
in drivers/staging/rtl8187se/r8180_core.c were changed to conform to kernel
standards. These definitions were duplicates of lines found in
drivers/staging/rtl8187se/ieee80211/dot11d.h. Once the change was made, the
following warnings were emitted:

  CC [M]  drivers/staging/rtl8187se/r8180_core.o
drivers/staging/rtl8187se/r8180_core.c:69:0: warning: "eqMacAddr" redefined
drivers/staging/rtl8187se/ieee80211/dot11d.h:39:0: note: this is the location of the previous definition
drivers/staging/rtl8187se/r8180_core.c:70:0: warning: "cpMacAddr" redefined
drivers/staging/rtl8187se/ieee80211/dot11d.h:40:0: note: this is the location of the previous definition

The fix is to keep only the difinition in the header file.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/rtl8187se/r8180_core.c