Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / zd1211rw / zd_rf_al7230b.c

diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
index f4e8b6ada854c54644b4ccfea7061a6ab1162c26..65095d661e6ba6ec392a48d48dc33479223a0fd8 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
@@ -1,4 +1,7 @@
-/* zd_rf_al7230b.c: Functions for the AL7230B 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
@@ -473,7 +476,7 @@ int zd_rf_init_al7230b(struct zd_rf *rf)
 {
        struct zd_chip *chip = zd_rf_to_chip(rf);
 
-       if (chip->is_zd1211b) {
+       if (zd_chip_is_zd1211b(chip)) {
                rf->init_hw = zd1211b_al7230b_init_hw;
                rf->switch_radio_on = zd1211b_al7230b_switch_radio_on;
                rf->set_channel = zd1211b_al7230b_set_channel;