rpms/kernel/FC-4/configs config-generic, 1.33, 1.33.4.1 config-ia64-generic, 1.3, 1.3.26.1 config-x86-generic, 1.9, 1.9.2.1 config-x86_64-generic, 1.9, 1.9.8.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-serv21784/configs

Modified Files:
      Tag: private-linville-fc4-jwltest-14-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.33
retrieving revision 1.33.4.1
diff -u -r1.33 -r1.33.4.1
--- config-generic	5 Aug 2005 22:30:30 -0000	1.33
+++ config-generic	22 Aug 2005 19:55:20 -0000	1.33.4.1
@@ -1402,8 +1402,7 @@
 CONFIG_STALDRV=y
 # CONFIG_FTAPE is not set
 # CONFIG_IBM_ASM is not set
-# TPM breaks 8139 driver in 2.6.12rc5
-# CONFIG_TCG_TPM is not set
+CONFIG_TCG_TPM=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v
retrieving revision 1.3
retrieving revision 1.3.26.1
diff -u -r1.3 -r1.3.26.1
--- config-ia64-generic	9 May 2005 22:19:09 -0000	1.3
+++ config-ia64-generic	22 Aug 2005 19:55:20 -0000	1.3.26.1
@@ -123,6 +123,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.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- config-x86-generic	15 Aug 2005 18:09:55 -0000	1.9
+++ config-x86-generic	22 Aug 2005 19:55:20 -0000	1.9.2.1
@@ -145,6 +145,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.9
retrieving revision 1.9.8.1
diff -u -r1.9 -r1.9.8.1
--- config-x86_64-generic	5 Jul 2005 19:42:24 -0000	1.9
+++ config-x86_64-generic	22 Aug 2005 19:55:20 -0000	1.9.8.1
@@ -75,6 +75,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=2001
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
+CONFIG_ACPI_INITRD=y
 
 CONFIG_CRASH=m