diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /include/linux/sound.h | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'include/linux/sound.h')
| -rw-r--r-- | include/linux/sound.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/sound.h b/include/linux/sound.h index 9e2a94feed6b..44dcf0570432 100644 --- a/include/linux/sound.h +++ b/include/linux/sound.h | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #define SND_DEV_AMIDI 13 /* Like /dev/midi (obsolete) */ | 25 | #define SND_DEV_AMIDI 13 /* Like /dev/midi (obsolete) */ |
| 26 | #define SND_DEV_ADMMIDI 14 /* Like /dev/dmmidi (onsolete) */ | 26 | #define SND_DEV_ADMMIDI 14 /* Like /dev/dmmidi (onsolete) */ |
| 27 | 27 | ||
| 28 | #ifdef __KERNEL__ | ||
| 28 | /* | 29 | /* |
| 29 | * Sound core interface functions | 30 | * Sound core interface functions |
| 30 | */ | 31 | */ |
| @@ -40,3 +41,4 @@ extern void unregister_sound_special(int unit); | |||
| 40 | extern void unregister_sound_mixer(int unit); | 41 | extern void unregister_sound_mixer(int unit); |
| 41 | extern void unregister_sound_midi(int unit); | 42 | extern void unregister_sound_midi(int unit); |
| 42 | extern void unregister_sound_dsp(int unit); | 43 | extern void unregister_sound_dsp(int unit); |
| 44 | #endif /* __KERNEL__ */ | ||