diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2011-04-02 12:25:54 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-07 23:34:13 +0400 |
| commit | fbd5d17b8e2b418b495599c554f9c4754b7f93c9 (patch) | |
| tree | 9338404d673b004c0bb22cc76e3721995ea5db34 /drivers/net/wireless/zd1211rw/zd_usb.h | |
| parent | 26cd322bacd3d65fffef6f8418c2fdad5b42e4b5 (diff) | |
| download | linux-fbd5d17b8e2b418b495599c554f9c4754b7f93c9.tar.xz | |
zd1211rw: rename CR* macros to ZD_CR*
With compat-wireless CR* macros in zd_usb.h conflict with CR macros in
include/asm-generic/termbits.h. So rename CR* macros to ZD_CR*.
Conversion was done with using sed and then 'over 80 character line'
checkpatch.pl warnings and comment indents were fixed.
Reported-by: Walter Goldens <goldenstranger@yahoo.com>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_usb.h')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_usb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zd1211rw/zd_usb.h index b3df2c8116cc..3924258ce177 100644 --- a/drivers/net/wireless/zd1211rw/zd_usb.h +++ b/drivers/net/wireless/zd1211rw/zd_usb.h @@ -109,7 +109,7 @@ struct usb_req_rfwrite { __le16 bits; /* RF2595: 24 */ __le16 bit_values[0]; - /* (CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) */ + /* (ZD_CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) */ } __packed; /* USB interrupt */ |