rpms/kernel/FC-4/configs config-generic, 1.35, 1.35.2.1 config-ia64-generic, 1.4, 1.4.2.1 config-x86-generic, 1.11, 1.11.2.1 config-x86_64-generic, 1.11, 1.11.2.1

[fedora-cvs-commits at redhat.com]

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv25922/configs

Modified Files:
      Tag: private-linville-fc4-jwltest-18-branch
	config-generic config-ia64-generic config-x86-generic 
	config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -r1.35 -r1.35.2.1
--- config-generic	30 Sep 2005 01:18:46 -0000	1.35
+++ config-generic	30 Sep 2005 17:41:22 -0000	1.35.2.1
@@ -1407,7 +1407,7 @@
 CONFIG_STALDRV=y
 # CONFIG_FTAPE is not set
 # CONFIG_IBM_ASM is not set
-# CONFIG_TCG_TPM is not set
+CONFIG_TCG_TPM=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- config-ia64-generic	29 Sep 2005 23:07:41 -0000	1.4
+++ config-ia64-generic	30 Sep 2005 17:41:22 -0000	1.4.2.1
@@ -124,6 +124,7 @@
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_BLACKLIST_YEAR=2001
+CONFIG_ACPI_INITRD=y
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_PM=y
 CONFIG_HOTPLUG_PCI=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- config-x86-generic	29 Sep 2005 23:07:41 -0000	1.11
+++ config-x86-generic	30 Sep 2005 17:41:22 -0000	1.11.2.1
@@ -148,6 +148,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=2001
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
+CONFIG_ACPI_INITRD=y
 CONFIG_PNPACPI=y
 
 #


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- config-x86_64-generic	29 Sep 2005 23:07:41 -0000	1.11
+++ config-x86_64-generic	30 Sep 2005 17:41:22 -0000	1.11.2.1
@@ -79,6 +79,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=2001
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
+CONFIG_ACPI_INITRD=y
 
 CONFIG_CRASH=m