diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
| commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
| tree | 94073696576323ff966e365d8c47b8ecd8372f97 /sound/ppc/pmac.h | |
| parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
| parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'sound/ppc/pmac.h')
| -rw-r--r-- | sound/ppc/pmac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/ppc/pmac.h b/sound/ppc/pmac.h index 086da7a18909..3a9bd4dbb9a6 100644 --- a/sound/ppc/pmac.h +++ b/sound/ppc/pmac.h | |||
| @@ -113,7 +113,8 @@ struct snd_pmac { | |||
| 113 | unsigned int initialized : 1; | 113 | unsigned int initialized : 1; |
| 114 | unsigned int feature_is_set : 1; | 114 | unsigned int feature_is_set : 1; |
| 115 | 115 | ||
| 116 | unsigned int of_requested; | 116 | unsigned int requested; |
| 117 | struct resource rsrc[3]; | ||
| 117 | 118 | ||
| 118 | int num_freqs; | 119 | int num_freqs; |
| 119 | int *freq_table; | 120 | int *freq_table; |