summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2007-02-05 18:53:29 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2007-02-05 18:53:29 +0000
commit4ef246722bfde824870d5909f7952f0237ff14a1 (patch)
tree4e53b0ede2c5c4560d4fc2bbd60b9d1a795ba448
parentStable on x86 (#165289) (diff)
downloadgentoo-2-4ef246722bfde824870d5909f7952f0237ff14a1.tar.gz
gentoo-2-4ef246722bfde824870d5909f7952f0237ff14a1.tar.bz2
gentoo-2-4ef246722bfde824870d5909f7952f0237ff14a1.zip
Updated the default ALSA_CARDS to build both emu10k1 drivers, since the emu10k1x driver is the Dell OEM driver.
-rw-r--r--profiles/default-linux/x86/ChangeLog6
-rw-r--r--profiles/default-linux/x86/make.defaults8
2 files changed, 9 insertions, 5 deletions
diff --git a/profiles/default-linux/x86/ChangeLog b/profiles/default-linux/x86/ChangeLog
index f0c7c1cf4a3f..ed763678d3f1 100644
--- a/profiles/default-linux/x86/ChangeLog
+++ b/profiles/default-linux/x86/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo/x86 profile directory
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.54 2007/02/04 06:57:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.55 2007/02/05 18:53:29 wolf31o2 Exp $
+
+ 05 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> make.defaults:
+ Updated the default ALSA_CARDS to build both emu10k1 drivers, since the
+ emu10k1x driver is the Dell OEM driver.
04 Feb 2007; <drac@gentoo.org> no-nptl/2.4/package.mask:
Mask xfce-extra/thunar-volman in no-nptl 2.4 profile because it needs hal.
diff --git a/profiles/default-linux/x86/make.defaults b/profiles/default-linux/x86/make.defaults
index 968243e4432f..ad53e41a84c0 100644
--- a/profiles/default-linux/x86/make.defaults
+++ b/profiles/default-linux/x86/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/make.defaults,v 1.17 2006/12/25 14:54:45 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/make.defaults,v 1.18 2007/02/05 18:53:29 wolf31o2 Exp $
# All extra USE/etc should be specified in sub-profiles.
# DO NOT POLLUTE USE ON THIS PROFILE.
@@ -24,6 +24,6 @@ VIDEO_CARDS="apm ark ati chips cirrus cyrix dummy fbdev glint i128 i740 i810 \
# 2006/12/21 - Andrej Kacian <ticho@gentoo.org>
# Defaults for audio drivers
-ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x \
- ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 \
- trident usb-audio via82xx via82xx-modem ymfpci"
+ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 \
+ emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m \
+ maestro3 trident usb-audio via82xx via82xx-modem ymfpci"