diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-15 02:24:42 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-15 02:24:42 -0400 |
| commit | 5d037f9064a8f3b9abbe383cdfb35e159d813711 (patch) | |
| tree | 2a2445271ee818c360c42408a324d2945a6dd9f7 /drivers/net/wireless/ath/ath9k/hw.c | |
| parent | 64f1e00d8edb54f5d25fb0114a46050fb8340df4 (diff) | |
| parent | 985b11fa8064d55d0d5a84e68667434598911bb2 (diff) | |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for 3.6
A bigger set of updates than I'm entirely comfortable with - things
backed up a bit due to travel. As ever the majority of these are small,
focused updates for specific drivers though there are a couple of core
changes. There's been good exposure in -next.
The AT91 patch fixes a build break.
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index cfa91ab7acf8..60b6a9daff7e 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
| @@ -730,6 +730,7 @@ int ath9k_hw_init(struct ath_hw *ah) | |||
| 730 | case AR9300_DEVID_QCA955X: | 730 | case AR9300_DEVID_QCA955X: |
| 731 | case AR9300_DEVID_AR9580: | 731 | case AR9300_DEVID_AR9580: |
| 732 | case AR9300_DEVID_AR9462: | 732 | case AR9300_DEVID_AR9462: |
| 733 | case AR9485_DEVID_AR1111: | ||
| 733 | break; | 734 | break; |
| 734 | default: | 735 | default: |
| 735 | if (common->bus_ops->ath_bus_type == ATH_USB) | 736 | if (common->bus_ops->ath_bus_type == ATH_USB) |