aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-26 19:15:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-26 19:15:31 -0400
commit4496d937a518fde0d0e1980e4ab470cedb4b50cd (patch)
treea02d57e13b44483417973a306f9fd23743959375 /sound
parent8e9d2089723d08d51e66c5eea49253d76e27941e (diff)
parent4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: irq_node.handler() should return irqreturn_t m68k: section mismatch fixes: Atari SCSI m68k: section mismatch fixes: DMAsound for Atari MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository m68k: mac - Add SWIM floppy support m68k: mac - Add a new entry in mac_model to identify the floppy controller type. m68k: Add install target
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/dmasound/dmasound_atari.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c
index 38931f2f6967..1f4774123064 100644
--- a/sound/oss/dmasound/dmasound_atari.c
+++ b/sound/oss/dmasound/dmasound_atari.c
@@ -1524,7 +1524,7 @@ static SETTINGS def_soft = {
1524 .speed = 8000 1524 .speed = 8000
1525} ; 1525} ;
1526 1526
1527static MACHINE machTT = { 1527static __initdata MACHINE machTT = {
1528 .name = "Atari", 1528 .name = "Atari",
1529 .name2 = "TT", 1529 .name2 = "TT",
1530 .owner = THIS_MODULE, 1530 .owner = THIS_MODULE,
@@ -1553,7 +1553,7 @@ static MACHINE machTT = {
1553 .capabilities = DSP_CAP_BATCH /* As per SNDCTL_DSP_GETCAPS */ 1553 .capabilities = DSP_CAP_BATCH /* As per SNDCTL_DSP_GETCAPS */
1554}; 1554};
1555 1555
1556static MACHINE machFalcon = { 1556static __initdata MACHINE machFalcon = {
1557 .name = "Atari", 1557 .name = "Atari",
1558 .name2 = "FALCON", 1558 .name2 = "FALCON",
1559 .dma_alloc = AtaAlloc, 1559 .dma_alloc = AtaAlloc,