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>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index 58236e6d0921..c9c1362e9499 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -1877,10 +1877,10 @@ int zd_usb_rfwrite(struct zd_usb *usb, u32 value, u8 bits)
 
         dev_dbg_f(zd_usb_dev(usb), "value %#09x bits %d\n", value, bits);
 
-        r = zd_usb_ioread16(usb, &bit_value_template, CR203);
+        r = zd_usb_ioread16(usb, &bit_value_template, ZD_CR203);
         if (r) {
                 dev_dbg_f(zd_usb_dev(usb),
-                        "error %d: Couldn't read CR203\n", r);
+                        "error %d: Couldn't read ZD_CR203\n", r);
                 return r;
         }
         bit_value_template &= ~(RF_IF_LE|RF_CLK|RF_DATA);