git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm.git
[pandora-kernel.git]
/
sound
/
core
/
sound.c
diff --git
a/sound/core/sound.c
b/sound/core/sound.c
index
7612884
..
3271e92
100644
(file)
--- a/
sound/core/sound.c
+++ b/
sound/core/sound.c
@@
-432,7
+432,7
@@
EXPORT_SYMBOL(snd_device_new);
EXPORT_SYMBOL(snd_device_register);
EXPORT_SYMBOL(snd_device_free);
/* isadma.c */
-#ifdef CONFIG_ISA
+#ifdef CONFIG_ISA
_DMA_API
EXPORT_SYMBOL(snd_dma_program);
EXPORT_SYMBOL(snd_dma_disable);
EXPORT_SYMBOL(snd_dma_pointer);