rpms/kernel-xen/devel/configs config-generic, 1.2, 1.3 config-ia64-generic, 1.2, 1.3 config-powerpc-generic, 1.2, 1.3 config-powerpc64-iseries, 1.2, 1.3 config-x86-generic, 1.3, 1.4 config-x86_64-generic, 1.3, 1.4

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Jan 9 20:42:22 UTC 2006


Author: sct

Update of /cvs/dist/rpms/kernel-xen/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv20340/configs

Modified Files:
	config-generic config-ia64-generic config-powerpc-generic 
	config-powerpc64-iseries config-x86-generic 
	config-x86_64-generic 
Log Message:
Rebase to:

  Rawhide kernel kernel-2.6.15-1.1826.2.9 from private-fc5-test2-branch
  Hypervisor from xen-unstable on 20060106
  linux-2.6-merge.hg xen upstream as of changeset 16985




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-generic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-generic	21 Dec 2005 11:24:56 -0000	1.2
+++ config-generic	9 Jan 2006 20:42:19 -0000	1.3
@@ -34,7 +34,7 @@
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_CFQ=y
+CONFIG_DEFAULT_AS=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
@@ -1034,10 +1034,12 @@
 # Wireless 802.11b ISA/PCI cards support
 #
 CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+CONFIG_IEEE80211_SOFTMAC_DEBUG=y
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW_DEBUG is not set
 # CONFIG_IPW2200 is not set
@@ -1050,6 +1052,7 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_BCM43XX=m
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1385,6 +1388,7 @@
 CONFIG_SERIAL_8250_CS=m
 # CONFIG_SERIAL_8250_ACPI is not set
 CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -1650,6 +1654,7 @@
 CONFIG_VIDEO_SAA5249=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y
 CONFIG_VIDEO_STRADIS=m
@@ -2033,7 +2038,8 @@
 CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_YEALINK=m
+# Has dumb detection, which gets loaded for every hid device.
+# CONFIG_USB_YEALINK is not set
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_GL620A=m
@@ -2383,6 +2389,16 @@
 
 # Turn off these debug options for production kernels.
 CONFIG_DEBUG_SLAB=y
+CONFIG_KMALLOC_ACCOUNTING=y
+
+# CONFIG_WAKEUP_TIMING is not set
+# CONFIG_WAKEUP_LATENCY_HIST is not set
+# CONFIG_CRITICAL_PREEMPT_TIMING is not set
+# CONFIG_CRITICAL_IRQSOFF_TIMING is not set
+# CONFIG_LATENCY_TIMING is not set
+# CONFIG_LATENCY_TRACE is not set
+# CONFIG_MCOUNT is not set
+
 
 #
 # Security options
@@ -2469,7 +2485,7 @@
 # CONFIG_TUX_DEBUG is not set
 
 CONFIG_CPUSETS=y
-CONFIG_SECCOMP=y
+# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 
 CONFIG_DETECT_SOFTLOCKUP=y
@@ -2484,7 +2500,7 @@
 
 CONFIG_IBMASR=m
 
-# CONFIG_PM_LEGACY is not set
+CONFIG_PM_LEGACY=y
 
 CONFIG_CRASH=m
 


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-ia64-generic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-ia64-generic	21 Dec 2005 11:24:56 -0000	1.2
+++ config-ia64-generic	9 Jan 2006 20:42:19 -0000	1.3
@@ -101,9 +101,6 @@
 # CONFIG_SCSI_BUSLOGIC is not set
 
 #
-# Compiler b0rkage and broken driver workarounds
-#
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
@@ -112,8 +109,8 @@
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc-generic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-powerpc-generic	21 Dec 2005 11:24:56 -0000	1.2
+++ config-powerpc-generic	9 Jan 2006 20:42:19 -0000	1.3
@@ -79,3 +79,4 @@
 # CONFIG_ATM_AMBASSADOR is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_BUSLOGIC is not set
+


Index: config-powerpc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc64-iseries,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-powerpc64-iseries	21 Dec 2005 11:24:56 -0000	1.2
+++ config-powerpc64-iseries	9 Jan 2006 20:42:19 -0000	1.3
@@ -22,6 +22,7 @@
 # CONFIG_FB_OF is not set
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_USB is not set
+# CONFIG_BT is not set
 # CONFIG_INPUT is not set
 # CONFIG_NET_RADIO is not set
 # CONFIG_MTD is not set
@@ -66,3 +67,8 @@
 # CONFIG_ISDN is not set
 # CONFIG_IEEE80211 is not set
 
+# CONFIG_DVB is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_SND_FM801_TEA575X is not set
+# CONFIG_IEEE1394 is not set
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-x86-generic	21 Dec 2005 15:04:58 -0000	1.3
+++ config-x86-generic	9 Jan 2006 20:42:19 -0000	1.4
@@ -268,3 +268,8 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
+CONFIG_WAKEUP_TIMING=y
+CONFIG_LATENCY_TIMING=y
+CONFIG_LATENCY_TRACE=y
+CONFIG_MCOUNT=y
+


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86_64-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-x86_64-generic	21 Dec 2005 15:04:58 -0000	1.3
+++ config-x86_64-generic	9 Jan 2006 20:42:19 -0000	1.4
@@ -141,3 +141,10 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
+CONFIG_WAKEUP_TIMING=y
+CONFIG_LATENCY_TIMING=y
+CONFIG_LATENCY_TRACE=y
+CONFIG_MCOUNT=y
+
+CONFIG_NVRAM=m
+




More information about the fedora-cvs-commits mailing list