diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-08 14:59:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-08 14:59:13 -0700 |
| commit | 8aa19ad84c38cd50bfc0560646efe1c9ca83d925 (patch) | |
| tree | 46eb8d8ea64620d989cabfe89c4f1d2dbba45b63 /include | |
| parent | 58a2c3221e3c78ea6c71148eb84d4170358981fb (diff) | |
| parent | a25f175c2f6962c38cdbacfc4b66b297f4fb54b2 (diff) | |
| download | talos-obmc-linux-8aa19ad84c38cd50bfc0560646efe1c9ca83d925.tar.gz talos-obmc-linux-8aa19ad84c38cd50bfc0560646efe1c9ca83d925.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/ac97_codec.h | 2 | ||||
| -rw-r--r-- | include/sound/emu10k1.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 2857cf0472df..d11f34832a97 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -527,6 +527,8 @@ struct _snd_ac97 { struct device dev; }; +#define to_ac97_t(d) container_of(d, struct _snd_ac97, dev) + /* conditions */ static inline int ac97_is_audio(ac97_t * ac97) { diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 67bf3f18e96a..14cb2718cb77 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -1059,7 +1059,7 @@ typedef struct { unsigned char spk71; /* Has 7.1 speakers */ unsigned char sblive51; /* SBLive! 5.1 - extout 0x11 -> center, 0x12 -> lfe */ unsigned char spdif_bug; /* Has Spdif phasing bug */ - unsigned char ac97_chip; /* Has an AC97 chip */ + unsigned char ac97_chip; /* Has an AC97 chip: 1 = mandatory, 2 = optional */ unsigned char ecard; /* APS EEPROM */ const char *driver; const char *name; |
