diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:15:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:15:31 -0700 |
| commit | 4496d937a518fde0d0e1980e4ab470cedb4b50cd (patch) | |
| tree | a02d57e13b44483417973a306f9fd23743959375 /sound | |
| parent | 8e9d2089723d08d51e66c5eea49253d76e27941e (diff) | |
| parent | 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 (diff) | |
| download | linux-4496d937a518fde0d0e1980e4ab470cedb4b50cd.tar.gz | |
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.c | 4 |
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 = { .speed = 8000 } ; -static MACHINE machTT = { +static __initdata MACHINE machTT = { .name = "Atari", .name2 = "TT", .owner = THIS_MODULE, @@ -1553,7 +1553,7 @@ static MACHINE machTT = { .capabilities = DSP_CAP_BATCH /* As per SNDCTL_DSP_GETCAPS */ }; -static MACHINE machFalcon = { +static __initdata MACHINE machFalcon = { .name = "Atari", .name2 = "FALCON", .dma_alloc = AtaAlloc, |