diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-02-21 15:12:04 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-02-21 15:12:04 -0500 |
| commit | fe7ef49a026fada706d93f504d368ebd0c0ef17b (patch) | |
| tree | 51b54dc52e1cbecc944e9738de65608960f84db5 /sound/pci/rme9652/rme9652.c | |
| parent | ba9c4b4d0b1a45b83b40eb1b8fa3d9d1be32fd97 (diff) | |
| parent | 1569265782ef26ed77ce45ebeb0676f11d4c114a (diff) | |
Merge tag 'v3.10.29' into v3.10-rt
This is the 3.10.29 stable release
Diffstat (limited to 'sound/pci/rme9652/rme9652.c')
| -rw-r--r-- | sound/pci/rme9652/rme9652.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index 773a67fff4cd..431bf6897dd6 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c @@ -285,7 +285,7 @@ static char channel_map_9636_ds[26] = { /* ADAT channels are remapped */ 1, 3, 5, 7, 9, 11, 13, 15, /* channels 8 and 9 are S/PDIF */ - 24, 25 + 24, 25, /* others don't exist */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; |