diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-08 13:37:51 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-08 13:37:51 +1000 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /sound/oss | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/au1550_ac97.c | 1 | ||||
| -rw-r--r-- | sound/oss/dmasound/tas_ioctl.h | 1 | ||||
| -rw-r--r-- | sound/oss/sh_dac_audio.c | 2 | ||||
| -rw-r--r-- | sound/oss/soundcard.c | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index a339f0c0d512..23018a7c063a 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c @@ -47,7 +47,6 @@ #include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/poll.h> -#include <linux/pci.h> #include <linux/bitops.h> #include <linux/spinlock.h> #include <linux/smp_lock.h> diff --git a/sound/oss/dmasound/tas_ioctl.h b/sound/oss/dmasound/tas_ioctl.h index dccae3a40e01..9d12b373b4a9 100644 --- a/sound/oss/dmasound/tas_ioctl.h +++ b/sound/oss/dmasound/tas_ioctl.h @@ -1,7 +1,6 @@ #ifndef _TAS_IOCTL_H_ #define _TAS_IOCTL_H_ -#include <linux/i2c.h> #include <linux/soundcard.h> diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c index 7ea9accc2ba4..b493660deb36 100644 --- a/sound/oss/sh_dac_audio.c +++ b/sound/oss/sh_dac_audio.c @@ -104,7 +104,7 @@ static void dac_audio_set_rate(void) unsigned long interval; struct clk *clk; - clk = clk_get("module_clk"); + clk = clk_get(NULL, "module_clk"); interval = (clk_get_rate(clk) / 4) / rate; clk_put(clk); ctrl_outl(interval, TMU1_TCOR); diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index dcd8d6d2f56f..a9c23b2502ad 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c @@ -44,6 +44,7 @@ #include <linux/smp_lock.h> #include <linux/module.h> #include <linux/mm.h> +#include <linux/device.h> /* * This ought to be moved into include/asm/dma.h |