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/pci/hda/hda_proc.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/pci/hda/hda_proc.c')
| -rw-r--r-- | sound/pci/hda/hda_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index f025200f2a62..bfe74c2fb079 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c | |||
| @@ -418,7 +418,7 @@ static void print_digital_conv(struct snd_info_buffer *buffer, | |||
| 418 | 418 | ||
| 419 | static const char *get_pwr_state(u32 state) | 419 | static const char *get_pwr_state(u32 state) |
| 420 | { | 420 | { |
| 421 | static const char *buf[4] = { | 421 | static const char * const buf[4] = { |
| 422 | "D0", "D1", "D2", "D3" | 422 | "D0", "D1", "D2", "D3" |
| 423 | }; | 423 | }; |
| 424 | if (state < 4) | 424 | if (state < 4) |