diff options
| author | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
|---|---|---|
| committer | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
| commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
| tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /sound/ppc/burgundy.c | |
| parent | 6d376756f2cf3478d5a4fdb8d18e958948366b9d (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'sound/ppc/burgundy.c')
| -rw-r--r-- | sound/ppc/burgundy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c index 3f837d9f3eb1..edbc0484e22a 100644 --- a/sound/ppc/burgundy.c +++ b/sound/ppc/burgundy.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | /* Waits for busy flag to clear */ | 32 | /* Waits for busy flag to clear */ |
| 33 | inline static void | 33 | static inline void |
| 34 | snd_pmac_burgundy_busy_wait(pmac_t *chip) | 34 | snd_pmac_burgundy_busy_wait(pmac_t *chip) |
| 35 | { | 35 | { |
| 36 | int timeout = 50; | 36 | int timeout = 50; |
| @@ -40,7 +40,7 @@ snd_pmac_burgundy_busy_wait(pmac_t *chip) | |||
| 40 | printk(KERN_DEBUG "burgundy_busy_wait: timeout\n"); | 40 | printk(KERN_DEBUG "burgundy_busy_wait: timeout\n"); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | inline static void | 43 | static inline void |
| 44 | snd_pmac_burgundy_extend_wait(pmac_t *chip) | 44 | snd_pmac_burgundy_extend_wait(pmac_t *chip) |
| 45 | { | 45 | { |
| 46 | int timeout; | 46 | int timeout; |