diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/sound/hdsp.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/sound/hdsp.h')
| -rw-r--r-- | include/sound/hdsp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/hdsp.h b/include/sound/hdsp.h index d98a78dff2db..0909a3843479 100644 --- a/include/sound/hdsp.h +++ b/include/sound/hdsp.h | |||
| @@ -28,6 +28,7 @@ enum HDSP_IO_Type { | |||
| 28 | Multiface, | 28 | Multiface, |
| 29 | H9652, | 29 | H9652, |
| 30 | H9632, | 30 | H9632, |
| 31 | RPM, | ||
| 31 | Undefined, | 32 | Undefined, |
| 32 | }; | 33 | }; |
| 33 | 34 | ||