rpms/kernel/FC-4/configs config-generic, 1.41, 1.41.8.1 config-ia64-generic, 1.5, 1.5.16.1 config-x86-generic, 1.12, 1.12.16.1 config-x86_64-generic, 1.12, 1.12.16.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-serv12084/configs

Modified Files:
      Tag: private-linville-jwltest-fc4-25-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.41
retrieving revision 1.41.8.1
diff -u -r1.41 -r1.41.8.1
--- config-generic	10 Nov 2005 19:37:40 -0000	1.41
+++ config-generic	29 Nov 2005 20:40:56 -0000	1.41.8.1
@@ -1035,6 +1035,8 @@
 CONFIG_R8169_VLAN=y
 CONFIG_SK98LIN=m
 CONFIG_SKGE=m
+CONFIG_SKY2=m
+CONFIG_SKY2_EC_A1=y
 CONFIG_TIGON3=m
 
 #


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v
retrieving revision 1.5
retrieving revision 1.5.16.1
diff -u -r1.5 -r1.5.16.1
--- config-ia64-generic	28 Oct 2005 05:23:09 -0000	1.5
+++ config-ia64-generic	29 Nov 2005 20:40:56 -0000	1.5.16.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_PM_DEBUG is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.12
retrieving revision 1.12.16.1
diff -u -r1.12 -r1.12.16.1
--- config-x86-generic	28 Oct 2005 05:23:09 -0000	1.12
+++ config-x86-generic	29 Nov 2005 20:40:56 -0000	1.12.16.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.12
retrieving revision 1.12.16.1
diff -u -r1.12 -r1.12.16.1
--- config-x86_64-generic	28 Oct 2005 05:23:09 -0000	1.12
+++ config-x86_64-generic	29 Nov 2005 20:40:56 -0000	1.12.16.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