rpms/kernel/devel linux-2.6-defaults-alsa-hda-beep-off.patch, NONE, 1.1 kernel.spec, 1.1170, 1.1171

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4751

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-defaults-alsa-hda-beep-off.patch 
Log Message:
* Thu Dec 18 2008 Kyle McMartin <kyle at redhat.com>
- Disable SND_HDA_BEEP by default


linux-2.6-defaults-alsa-hda-beep-off.patch:

--- NEW FILE linux-2.6-defaults-alsa-hda-beep-off.patch ---
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 3ecd7e7..2762b40 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -122,7 +122,7 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
 	beep->nid = nid;
 	beep->dev = input_dev;
 	beep->codec = codec;
-	beep->enabled = 1;
+	beep->enabled = 0;
 	codec->beep = beep;
 
 	INIT_WORK(&beep->beep_work, &snd_hda_generate_beep);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1170
retrieving revision 1.1171
diff -u -r1.1170 -r1.1171
--- kernel.spec	18 Dec 2008 14:19:16 -0000	1.1170
+++ kernel.spec	18 Dec 2008 18:18:39 -0000	1.1171
@@ -624,6 +624,8 @@
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 Patch590: linux-2.6-selinux-move-open-perms-check.patch
 
+Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
+
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
@@ -1137,6 +1139,9 @@
 
 # Changes to upstream defaults.
 
+# squelch hda_beep by default
+ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
+
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
@@ -1763,6 +1768,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Dec 18 2008 Kyle McMartin <kyle at redhat.com>
+- Disable SND_HDA_BEEP by default
+
 * Thu Dec 18 2008 Dave Jones <davej at redhat.com>
 - 2.6.28-rc8-git6