Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latest

[mv-sheeva.git] / drivers / net / wireless / zd1211rw / zd_rf_rf2959.c

diff --git a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
index 58247271cc240abc4bf31d4cd8dc26404dfa107e..0597d862fbd2edb47368fd13c4db04b0c4d918cc 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
@@ -1,4 +1,7 @@
-/* zd_rf_rfmd.c: Functions for the RFMD RF controller
+/* ZD1211 USB-WLAN driver for Linux
+ *
+ * Copyright (C) 2005-2007 Ulrich Kunitz <kune@deine-taler.de>
+ * Copyright (C) 2006-2007 Daniel Drake <dsd@gentoo.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +24,7 @@
 #include "zd_usb.h"
 #include "zd_chip.h"
 
-static u32 rf2959_table[][2] = {
+static const u32 rf2959_table[][2] = {
        RF_CHANNEL( 1) = { 0x181979, 0x1e6666 },
        RF_CHANNEL( 2) = { 0x181989, 0x1e6666 },
        RF_CHANNEL( 3) = { 0x181999, 0x1e6666 },
@@ -228,7 +231,7 @@ static int rf2959_init_hw(struct zd_rf *rf)
 static int rf2959_set_channel(struct zd_rf *rf, u8 channel)
 {
        int i, r;
-       u32 *rv = rf2959_table[channel-1];
+       const u32 *rv = rf2959_table[channel-1];
        struct zd_chip *chip = zd_rf_to_chip(rf);
 
        for (i = 0; i < 2; i++) {
@@ -265,7 +268,7 @@ int zd_rf_init_rf2959(struct zd_rf *rf)
 {
        struct zd_chip *chip = zd_rf_to_chip(rf);
 
-       if (chip->is_zd1211b) {
+       if (zd_chip_is_zd1211b(chip)) {
                dev_err(zd_chip_dev(chip),
                       "RF2959 is currently not supported for ZD1211B"
                       " devices\n");