diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/oss/dmasound/Kconfig | 2 | ||||
-rw-r--r-- | sound/oss/dmasound/dmasound_paula.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sound/oss/dmasound/Kconfig b/sound/oss/dmasound/Kconfig index 71b313479f83..3eb782720e58 100644 --- a/sound/oss/dmasound/Kconfig +++ b/sound/oss/dmasound/Kconfig | |||
@@ -14,7 +14,7 @@ config DMASOUND_ATARI | |||
14 | 14 | ||
15 | config DMASOUND_PAULA | 15 | config DMASOUND_PAULA |
16 | tristate "Amiga DMA sound support" | 16 | tristate "Amiga DMA sound support" |
17 | depends on (AMIGA || APUS) && SOUND | 17 | depends on AMIGA && SOUND |
18 | select DMASOUND | 18 | select DMASOUND |
19 | help | 19 | help |
20 | If you want to use the internal audio of your Amiga in Linux, answer | 20 | If you want to use the internal audio of your Amiga in Linux, answer |
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c index 90fc058e1159..202e8103dc4d 100644 --- a/sound/oss/dmasound/dmasound_paula.c +++ b/sound/oss/dmasound/dmasound_paula.c | |||
@@ -91,10 +91,6 @@ static irqreturn_t AmiInterrupt(int irq, void *dummy); | |||
91 | * power LED are controlled by the same line. | 91 | * power LED are controlled by the same line. |
92 | */ | 92 | */ |
93 | 93 | ||
94 | #ifdef CONFIG_APUS | ||
95 | #define mach_heartbeat ppc_md.heartbeat | ||
96 | #endif | ||
97 | |||
98 | static void (*saved_heartbeat)(int) = NULL; | 94 | static void (*saved_heartbeat)(int) = NULL; |
99 | 95 | ||
100 | static inline void disable_heartbeat(void) | 96 | static inline void disable_heartbeat(void) |