diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2009-07-08 22:07:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:40 -0700 |
| commit | b8bc58c5fbfb25acbafc021fc392a8d93b541585 (patch) | |
| tree | c9996655d1d99192185b73534b38b75b3eafcc39 /drivers/staging/rt2870 | |
| parent | bc0db7314240c7aa2866546e80b8ba157c8009f7 (diff) | |
| download | kernel_samsung_smdk4412-b8bc58c5fbfb25acbafc021fc392a8d93b541585.zip kernel_samsung_smdk4412-b8bc58c5fbfb25acbafc021fc392a8d93b541585.tar.gz kernel_samsung_smdk4412-b8bc58c5fbfb25acbafc021fc392a8d93b541585.tar.bz2 | |
Staging: rt*: don't confuse user of rt3070 driver with rt2870 strings
Original author didn't bother to change strings for rt3070 driver. Fix it.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2870')
| -rw-r--r-- | drivers/staging/rt2870/2870_main_dev.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rt2870/rt2870.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/staging/rt2870/2870_main_dev.c b/drivers/staging/rt2870/2870_main_dev.c index a4e8696..887627f 100644 --- a/drivers/staging/rt2870/2870_main_dev.c +++ b/drivers/staging/rt2870/2870_main_dev.c @@ -45,7 +45,7 @@ // *** If you have a solution for the bug in current version of driver, please mail to me. // Otherwise post to forum in ralinktech's web site(www.ralinktech.com) and let all users help you. *** MODULE_AUTHOR("Paul Lin <paul_lin@ralinktech.com>"); -MODULE_DESCRIPTION("RT2870 Wireless Lan Linux Driver"); +MODULE_DESCRIPTION(RT28xx_CHIP_NAME " Wireless LAN Linux Driver"); MODULE_LICENSE("GPL"); #ifdef MODULE_VERSION MODULE_VERSION(STA_DRIVER_VERSION); @@ -1441,7 +1441,7 @@ VOID RT2870_BssBeaconStart( pAd->CommonCfg.BeaconAdjust = 0; pAd->CommonCfg.BeaconFactor = 0xffffffff / (pAd->CommonCfg.BeaconPeriod << 10); pAd->CommonCfg.BeaconRemain = (0xffffffff % (pAd->CommonCfg.BeaconPeriod << 10)) + 1; - printk("RT2870_BssBeaconStart:BeaconFactor=%d, BeaconRemain=%d!\n", pAd->CommonCfg.BeaconFactor, pAd->CommonCfg.BeaconRemain); + printk(RT28xx_CHIP_NAME "_BssBeaconStart:BeaconFactor=%d, BeaconRemain=%d!\n", pAd->CommonCfg.BeaconFactor, pAd->CommonCfg.BeaconRemain); RTMPSetTimer(&pAd->CommonCfg.BeaconUpdateTimer, pAd->CommonCfg.BeaconPeriod); } diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h index 030cc9b..f42cb44 100644 --- a/drivers/staging/rt2870/rt2870.h +++ b/drivers/staging/rt2870/rt2870.h @@ -527,7 +527,11 @@ extern UCHAR EpToQueue[6]; { RTUSB_SET_BULK_FLAG(pAd, fRTUSB_BULK_OUT_PSPOLL); \ RTUSBKickBulkOut(pAd); } +#ifdef RT30xx +#define RT28xx_CHIP_NAME "RT3070" +#else #define RT28xx_CHIP_NAME "RT2870" +#endif #define USB_CYC_CFG 0x02a4 #ifndef RT30xx #define STATUS_SUCCESS 0x00 |