summaryrefslogtreecommitdiff
path: root/include/linux/sound.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-03 08:15:35 (GMT)
committerDavid S. Miller <davem@davemloft.net>2009-02-03 08:15:35 (GMT)
commitb3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch)
tree99e5b423473097756353d038f922b2623f3edd2a /include/linux/sound.h
parent1bded710a574f20d41bc9e7fb531301db282d623 (diff)
parentfb53fde9762432d091dac209bdf4f3f850117c55 (diff)
downloadlinux-fsl-qoriq-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/Kconfig
Diffstat (limited to 'include/linux/sound.h')
-rw-r--r--include/linux/sound.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/sound.h b/include/linux/sound.h
index 9e2a94f..44dcf05 100644
--- a/include/linux/sound.h
+++ b/include/linux/sound.h
@@ -25,6 +25,7 @@
#define SND_DEV_AMIDI 13 /* Like /dev/midi (obsolete) */
#define SND_DEV_ADMMIDI 14 /* Like /dev/dmmidi (onsolete) */
+#ifdef __KERNEL__
/*
* Sound core interface functions
*/
@@ -40,3 +41,4 @@ extern void unregister_sound_special(int unit);
extern void unregister_sound_mixer(int unit);
extern void unregister_sound_midi(int unit);
extern void unregister_sound_dsp(int unit);
+#endif /* __KERNEL__ */