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 /sound/drivers/vx/vx_pcm.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/drivers/vx/vx_pcm.c')
| -rw-r--r-- | sound/drivers/vx/vx_pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c index 35a2f71a6af5..5e897b236cec 100644 --- a/sound/drivers/vx/vx_pcm.c +++ b/sound/drivers/vx/vx_pcm.c | |||
| @@ -1189,7 +1189,7 @@ void vx_pcm_update_intr(struct vx_core *chip, unsigned int events) | |||
| 1189 | 1189 | ||
| 1190 | 1190 | ||
| 1191 | /* | 1191 | /* |
| 1192 | * vx_init_audio_io - check the availabe audio i/o and allocate pipe arrays | 1192 | * vx_init_audio_io - check the available audio i/o and allocate pipe arrays |
| 1193 | */ | 1193 | */ |
| 1194 | static int vx_init_audio_io(struct vx_core *chip) | 1194 | static int vx_init_audio_io(struct vx_core *chip) |
| 1195 | { | 1195 | { |