rpms/kernel/devel config-ia64-generic, 1.11, 1.12 config-x86-generic, 1.36, 1.37 config-x86_64-generic, 1.35, 1.36 kernel.spec, 1.705, 1.706

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12204

Modified Files:
	config-ia64-generic config-x86-generic config-x86_64-generic 
	kernel.spec 
Log Message:
Change ACPI button driver to non-modular.


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-ia64-generic	16 May 2008 21:06:38 -0000	1.11
+++ config-ia64-generic	23 Jun 2008 20:46:06 -0000	1.12
@@ -119,7 +119,7 @@
 # CONFIG_ACPI_BAY is not set
 # CONFIG_ACPI_BATTERY is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
-CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_BUTTON=y
 # CONFIG_ACPI_DOCK is not set
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- config-x86-generic	28 May 2008 21:48:59 -0000	1.36
+++ config-x86-generic	23 Jun 2008 20:46:06 -0000	1.37
@@ -133,7 +133,7 @@
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BAY=m
 CONFIG_ACPI_BLACKLIST_YEAR=1999
-CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_EC=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- config-x86_64-generic	28 May 2008 21:48:59 -0000	1.35
+++ config-x86_64-generic	23 Jun 2008 20:46:06 -0000	1.36
@@ -77,7 +77,7 @@
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BAY=m
 CONFIG_ACPI_BLACKLIST_YEAR=0
-CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_EC=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -r1.705 -r1.706
--- kernel.spec	22 Jun 2008 20:54:08 -0000	1.705
+++ kernel.spec	23 Jun 2008 20:46:06 -0000	1.706
@@ -1785,6 +1785,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Jun 23 2008 Dave Jones <davej at redhat.com>
+- Change ACPI button driver to non-modular.
+
 * Sun Jun 22 2008 Dave Jones <davej at redhat.com>
 - 2.6.26-rc7-git1