diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:53 -0400 |
| commit | c54f9da1c8ceee19436430afac0798a989eb886d (patch) | |
| tree | 412f51c3f2641e4205b767cec95ce6107cd39d36 /include/sound | |
| parent | a2eddfa95919a730e0e5ed17e9c303fe5ba249cd (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/irqstats
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/ac97_codec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 049edc5e6461..9c309daf492b 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h | |||
| @@ -505,6 +505,7 @@ struct snd_ac97 { | |||
| 505 | unsigned short pcmreg[3]; // PCM registers | 505 | unsigned short pcmreg[3]; // PCM registers |
| 506 | unsigned short codec_cfg[3]; // CODEC_CFG bits | 506 | unsigned short codec_cfg[3]; // CODEC_CFG bits |
| 507 | unsigned char swap_mic_linein; // AD1986/AD1986A only | 507 | unsigned char swap_mic_linein; // AD1986/AD1986A only |
| 508 | unsigned char lo_as_master; /* LO as master */ | ||
| 508 | } ad18xx; | 509 | } ad18xx; |
| 509 | unsigned int dev_flags; /* device specific */ | 510 | unsigned int dev_flags; /* device specific */ |
| 510 | } spec; | 511 | } spec; |