aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-27 09:36:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-27 09:36:33 -0700
commit31390d0fde1ac9cf47002729660ffd7cd2ae1d75 (patch)
tree4188ec73c65a182257e6b46e56e8423ad6cbe3b3 /sound/oss
parent6634160abfdbac39bd5ebda516b15b078a0f598e (diff)
parent0a9b86381c76e9d33a9b6edb66aef32d7a3306e3 (diff)
downloadkernel_samsung_aries-31390d0fde1ac9cf47002729660ffd7cd2ae1d75.zip
kernel_samsung_aries-31390d0fde1ac9cf47002729660ffd7cd2ae1d75.tar.gz
kernel_samsung_aries-31390d0fde1ac9cf47002729660ffd7cd2ae1d75.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: Blackfin: update SPORT0 port selector (v2) ALSA: hda - Restore default pin configs for realtek codecs sound: use a common working email address pci: use pci_ioremap_bar() in sound/
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/kahlua.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index eb9bc36..c180598 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -1,7 +1,7 @@
/*
* Initialisation code for Cyrix/NatSemi VSA1 softaudio
*
- * (C) Copyright 2003 Red Hat Inc <alan@redhat.com>
+ * (C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk>
*
* XpressAudio(tm) is used on the Cyrix MediaGX (now NatSemi Geode) systems.
* The older version (VSA1) provides fairly good soundblaster emulation