diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-05-22 17:50:00 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-22 17:50:00 +0200 |
| commit | 0c1d1210160f560841a48641d41b61ec7d05edb2 (patch) | |
| tree | 14942dc1820fcb9b102b9098e5bacd5b59b78048 /drivers/isdn/hisax/icc.c | |
| parent | ALSA: Replace DEFINE_PCI_DEVICE_TABLE macro use (diff) | |
| parent | Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm8731', 'asoc... (diff) | |
| download | linux-0c1d1210160f560841a48641d41b61ec7d05edb2.tar.xz linux-0c1d1210160f560841a48641d41b61ec7d05edb2.zip | |
Merge tag 'asoc-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.16
Lots of cleanup work going on in the core this release but very little
visible to external users except for the new drivers that have been
added.
- Support for specifying aux CODECs in DT.
- Removal of the deprecated mux and enum macros.
- More moves towards full componentisation.
- Removal of some unused I/O code.
- Lots of cleanups, fixes and enhancements to the davinci, Freescale,
Haswell and Realtek drivers.
- Several drivers exposed directly in Kconfig for use with simple-card.
- New drivers for Cirrus CS42L56, Realtek RT5639, RT5642 and RT5651 and
ST STA350.
Diffstat (limited to 'drivers/isdn/hisax/icc.c')
| -rw-r--r-- | drivers/isdn/hisax/icc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c index 51dae9167238..96d1df05044f 100644 --- a/drivers/isdn/hisax/icc.c +++ b/drivers/isdn/hisax/icc.c @@ -425,7 +425,7 @@ afterXPR: if (cs->debug & L1_DEB_MONITOR) debugl1(cs, "ICC %02x -> MOX1", cs->dc.icc.mon_tx[cs->dc.icc.mon_txp - 1]); } - AfterMOX1: + AfterMOX1: ; #endif } } |