diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-18 13:19:25 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-18 13:19:25 +1100 |
| commit | 82a0a1cc8f94bc59e5919715bc03fc8353fa770d (patch) | |
| tree | c25f19a0ae1f7cb75319b585c1d473cfed463f22 /drivers/net/wireless/zd1211rw/zd_rf.c | |
| parent | 8d30c14cab30d405a05f2aaceda1e9ad57800f36 (diff) | |
| parent | 5955c7a2cfb6a35429adea5dc480002b15ca8cfc (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/pgtable-ppc32.h
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_rf.c')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_rf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c index 7207bfd2e6c..c875ee05e22 100644 --- a/drivers/net/wireless/zd1211rw/zd_rf.c +++ b/drivers/net/wireless/zd1211rw/zd_rf.c @@ -86,6 +86,7 @@ int zd_rf_init_hw(struct zd_rf *rf, u8 type) case AL7230B_RF: r = zd_rf_init_al7230b(rf); break; + case MAXIM_NEW_RF: case UW2453_RF: r = zd_rf_init_uw2453(rf); break; |