Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c
index 7407409b60b1..abe5d38f7f4d 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf.c
@@ -34,7 +34,7 @@ static const char * const rfs[] = {
         [AL2210_RF]     = "AL2210_RF",
         [MAXIM_NEW_RF]  = "MAXIM_NEW_RF",
         [UW2453_RF]     = "UW2453_RF",
-        [UNKNOWN_A_RF]  = "UNKNOWN_A_RF",
+        [AL2230S_RF]    = "AL2230S_RF",
         [RALINK_RF]     = "RALINK_RF",
         [INTERSIL_RF]   = "INTERSIL_RF",
         [RF2959_RF]     = "RF2959_RF",
@@ -77,6 +77,7 @@ int zd_rf_init_hw(struct zd_rf *rf, u8 type)
                 r = zd_rf_init_rf2959(rf);
                 break;
         case AL2230_RF:
+        case AL2230S_RF:
                 r = zd_rf_init_al2230(rf);
                 break;
         case AL7230B_RF: