diff options
| author |   Larry Finger <Larry.Finger@lwfinger.net> | 2011-06-28 18:55:50 -0500 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-06-29 15:11:06 -0400 |
| commit | ab049fbf5ea87fc92441fc5211c315d04a312cca (patch) | |
| tree | 6f0c9df0a08fabcd38c11cb19432608165acc7bd /drivers/net/wireless/rtlwifi/rtl8192de/dm.h | |
| parent | b43: HT-PHY: correct 0x2059 radio init (diff) | |
| download | linux-dev-ab049fbf5ea87fc92441fc5211c315d04a312cca.tar.xz linux-dev-ab049fbf5ea87fc92441fc5211c315d04a312cca.zip | |
rtlwifi: rtl8192de: Fix build errors when using allyes configuration
After adding rtl8192de to linux-next, making the rtlwifi drivers be built-in
results in the following warnings:
LD drivers/net/wireless/rtlwifi/built-in.o
drivers/net/wireless/rtlwifi/rtl8192de/built-in.o: In function `rtl92ce_sw_led_on':
(.text+0x11fb6): multiple definition of `rtl92ce_sw_led_on'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.text+0xa326): first defined here
drivers/net/wireless/rtlwifi/rtl8192de/built-in.o:(.bss+0x0): multiple definition of `dm_digtable'
drivers/net/wireless/rtlwifi/rtl8192c/built-in.o:(.bss+0x0): first defined here
ld: Warning: size of symbol `dm_digtable' changed from 40 in drivers/net/wireless/rtlwifi/rtl8192c/built-in.o to 48 in drivers/net/wireless/rtlwifi/rtl8192de/built-in.o
drivers/net/wireless/rtlwifi/rtl8192de/built-in.o: In function `rtl92ce_sw_led_off':
(.text+0x11cfe): multiple definition of `rtl92ce_sw_led_off'
drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.text+0xa06e): first defined here
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192de/dm.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/dm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.h b/drivers/net/wireless/rtlwifi/rtl8192de/dm.h index b3a42ff81456..69354657f0f5 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.h +++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.h @@ -200,7 +200,7 @@ enum dm_dig_connect { DIG_CONNECT_MAX }; -extern struct dig_t dm_digtable; +extern struct dig_t de_digtable; void rtl92d_dm_init(struct ieee80211_hw *hw); void rtl92d_dm_watchdog(struct ieee80211_hw *hw); |