rpms/kernel/devel config-generic,1.138,1.139

[Roland McGrath (roland)]

Author: roland

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

Modified Files:
	config-generic 
Log Message:
New items for 2.6.26-git11


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- config-generic	23 Jul 2008 19:51:09 -0000	1.138
+++ config-generic	24 Jul 2008 08:59:56 -0000	1.139
@@ -2861,6 +2861,7 @@
 
 # Multifunction USB devices
 CONFIG_MFD_SM501=m
+# CONFIG_MFD_TC6393XB is not set
 
 #
 # File systems
@@ -3296,6 +3297,7 @@
 CONFIG_ENABLE_MUST_CHECK=y
 
 CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 
 CONFIG_KEXEC=y
 
@@ -3491,8 +3493,11 @@
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
+CONFIG_DMADEVICES=y
+CONFIG_INTEL_IOATDMA=m
 CONFIG_DMA_ENGINE=y
 CONFIG_NET_DMA=y
+# CONFIG_DMATEST is not set
 
 CONFIG_UNUSED_SYMBOLS=y