diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /drivers/sbus/audio/audio.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/sbus/audio/audio.c')
| -rw-r--r-- | drivers/sbus/audio/audio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sbus/audio/audio.c b/drivers/sbus/audio/audio.c index 5062a4300..81510b8d2 100644 --- a/drivers/sbus/audio/audio.c +++ b/drivers/sbus/audio/audio.c @@ -1,4 +1,4 @@ -/* $Id: audio.c,v 1.56 2000/10/19 00:50:02 davem Exp $ +/* $Id: audio.c,v 1.58 2001/02/13 01:16:59 davem Exp $ * drivers/sbus/audio/audio.c * * Copyright 1996 Thomas K. Dyas (tdyas@noc.rutgers.edu) @@ -28,13 +28,13 @@ #include <linux/mm.h> #include <linux/tqueue.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/init.h> #include <linux/soundcard.h> #include <linux/version.h> #include <linux/devfs_fs_kernel.h> -#include <asm/delay.h> +#include <linux/delay.h> #include <asm/pgtable.h> #include <asm/audioio.h> @@ -511,7 +511,7 @@ static int sparcaudio_mixer_ioctl(struct inode * inode, struct file * file, m = drv->ops->get_input_balance(drv); i = OSS_TO_GAIN(k); j = OSS_TO_BAL(k); - oprintk((" for stereo to to %d (bal %d):", i, j)); + oprintk((" for stereo to do %d (bal %d):", i, j)); if (drv->ops->set_input_volume) drv->ops->set_input_volume(drv, i); if (drv->ops->set_input_balance) |