diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-11-03 15:51:26 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-03 15:51:26 +0100 |
| commit | 69dbdd819599e2f3b77c172e83af512845bca5ad (patch) | |
| tree | 49939d8b80ec2115a801eae2aebc21f23867c876 /sound/oss | |
| parent | ALSA: hda - MacBookAir3,1(3,2) alsa support (diff) | |
| parent | ASoC: tpa6130a2: Get rid of compile warning from tpa6130a2_power (diff) | |
| download | linux-dev-69dbdd819599e2f3b77c172e83af512845bca5ad.tar.xz linux-dev-69dbdd819599e2f3b77c172e83af512845bca5ad.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/ac97_codec.c | 7 | ||||
| -rw-r--r-- | sound/oss/msnd_pinnacle.c | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c index 456a1b4d7832..854c303264dc 100644 --- a/sound/oss/ac97_codec.c +++ b/sound/oss/ac97_codec.c @@ -21,11 +21,8 @@ * ************************************************************************** * - * The Intel Audio Codec '97 specification is available at the Intel - * audio homepage: http://developer.intel.com/ial/scalableplatforms/audio/ - * - * The specification itself is currently available at: - * ftp://download.intel.com/ial/scalableplatforms/ac97r22.pdf + * The Intel Audio Codec '97 specification is available at: + * http://download.intel.com/support/motherboards/desktop/sb/ac97_r23.pdf * ************************************************************************** * diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c index b4c1eb504c22..7b5c77b32a90 100644 --- a/sound/oss/msnd_pinnacle.c +++ b/sound/oss/msnd_pinnacle.c @@ -1118,6 +1118,7 @@ static const struct file_operations dev_fileops = { .unlocked_ioctl = dev_ioctl, .open = dev_open, .release = dev_release, + .llseek = noop_llseek, }; static int reset_dsp(void) |