diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
| commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
| tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /include/sound/ymfpci.h | |
| parent | b73d884756303316ead4cd7dad51236b2a515a1a (diff) | |
| parent | 86d710146fb9975f04c505ec78caa43d227c1018 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'include/sound/ymfpci.h')
| -rw-r--r-- | include/sound/ymfpci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h index 05ead6698434..444cd6ba0ba7 100644 --- a/include/sound/ymfpci.h +++ b/include/sound/ymfpci.h | |||
| @@ -331,6 +331,7 @@ struct snd_ymfpci { | |||
| 331 | struct snd_ac97 *ac97; | 331 | struct snd_ac97 *ac97; |
| 332 | struct snd_rawmidi *rawmidi; | 332 | struct snd_rawmidi *rawmidi; |
| 333 | struct snd_timer *timer; | 333 | struct snd_timer *timer; |
| 334 | unsigned int timer_ticks; | ||
| 334 | 335 | ||
| 335 | struct pci_dev *pci; | 336 | struct pci_dev *pci; |
| 336 | struct snd_card *card; | 337 | struct snd_card *card; |