aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/dmasound/dmasound_awacs.c4
-rw-r--r--sound/oss/pss.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index 2704e1598add..2ceb46f1d40f 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -1557,7 +1557,7 @@ static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when)
1557/* All the burgundy functions: */ 1557/* All the burgundy functions: */
1558 1558
1559/* Waits for busy flag to clear */ 1559/* Waits for busy flag to clear */
1560inline static void 1560static inline void
1561awacs_burgundy_busy_wait(void) 1561awacs_burgundy_busy_wait(void)
1562{ 1562{
1563 int count = 50; /* > 2 samples at 44k1 */ 1563 int count = 50; /* > 2 samples at 44k1 */
@@ -1565,7 +1565,7 @@ awacs_burgundy_busy_wait(void)
1565 udelay(1) ; 1565 udelay(1) ;
1566} 1566}
1567 1567
1568inline static void 1568static inline void
1569awacs_burgundy_extend_wait(void) 1569awacs_burgundy_extend_wait(void)
1570{ 1570{
1571 int count = 50 ; /* > 2 samples at 44k1 */ 1571 int count = 50 ; /* > 2 samples at 44k1 */
diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 3ed38765dcc4..a617ccb40e00 100644
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -714,7 +714,7 @@ static int __init attach_pss(struct address_info *hw_config)
714 714
715 disable_all_emulations(); 715 disable_all_emulations();
716 716
717#if YOU_REALLY_WANT_TO_ALLOCATE_THESE_RESOURCES 717#ifdef YOU_REALLY_WANT_TO_ALLOCATE_THESE_RESOURCES
718 if (sound_alloc_dma(hw_config->dma, "PSS")) 718 if (sound_alloc_dma(hw_config->dma, "PSS"))
719 { 719 {
720 printk("pss.c: Can't allocate DMA channel.\n"); 720 printk("pss.c: Can't allocate DMA channel.\n");