diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 23:18:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 23:18:56 +0000 |
| commit | 4d657aa39d5bcae60c2c11bf8fb66692ddd1c9e7 (patch) | |
| tree | 30f3b08741a4d4b98b16bd99ea2757ff715d1c11 /include/asm-sparc | |
| parent | eed6b7c84cc33f229f6fecd884d9a22af5bec514 (diff) | |
Merge with 2.4.0-test5 final.
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/audioio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sparc/audioio.h b/include/asm-sparc/audioio.h index 28fe82dc7..fc5458949 100644 --- a/include/asm-sparc/audioio.h +++ b/include/asm-sparc/audioio.h @@ -586,6 +586,7 @@ int BAL_TO_OSS(int value, unsigned char balance) return ((r << 8) + l); } +#ifdef __KERNEL__ /* OSS mixer ioctl port handling */ static __inline__ int OSS_PORT_AUDIO(struct sparcaudio_driver *drv, unsigned int set) @@ -642,4 +643,5 @@ void OSS_TWIDDLE_IPORT(struct sparcaudio_driver *drv, unsigned int ioctl, } } } +#endif /* __KERNEL__ */ #endif /* _AUDIOIO_H_ */ |