diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:10:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:10:44 -0500 |
| commit | a5a64498c194c82ecad3a2d67cff6231cda8d3dd (patch) | |
| tree | 723d5d81419f9960b8d30ed9a2ece8a58d6c4328 /sound/ppc/snd_ps3.h | |
| parent | bb93d802ae5c1949977cc6da247b218240677f11 (diff) | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) | |
Merge commit 'v2.6.28-rc4' into timers/rtc
Conflicts:
drivers/rtc/rtc-cmos.c
Diffstat (limited to 'sound/ppc/snd_ps3.h')
| -rw-r--r-- | sound/ppc/snd_ps3.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/ppc/snd_ps3.h b/sound/ppc/snd_ps3.h index 4b7e6fbbe500..326fb29e82d8 100644 --- a/sound/ppc/snd_ps3.h +++ b/sound/ppc/snd_ps3.h | |||
| @@ -51,6 +51,7 @@ struct snd_ps3_avsetting_info { | |||
| 51 | uint32_t avs_audio_width; | 51 | uint32_t avs_audio_width; |
| 52 | uint32_t avs_audio_format; /* fixed */ | 52 | uint32_t avs_audio_format; /* fixed */ |
| 53 | uint32_t avs_audio_source; /* fixed */ | 53 | uint32_t avs_audio_source; /* fixed */ |
| 54 | unsigned char avs_cs_info[8]; | ||
| 54 | }; | 55 | }; |
| 55 | /* | 56 | /* |
| 56 | * PS3 audio 'card' instance | 57 | * PS3 audio 'card' instance |