rpms/kernel/devel/configs config-generic, 1.176, 1.177 config-ia64-generic, 1.23, 1.24

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	config-generic config-ia64-generic 
Log Message:
git12



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- config-generic	4 Apr 2006 18:37:05 -0000	1.176
+++ config-generic	16 Apr 2006 22:58:48 -0000	1.177
@@ -93,7 +93,8 @@
 CONFIG_INFINIBAND_MTHCA=m
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
 CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -457,6 +458,7 @@
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
@@ -2160,6 +2162,7 @@
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_IPAQ=m
@@ -2219,12 +2222,10 @@
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_MTOUCH=m
 CONFIG_USB_ATI_REMOTE=m
 CONFIG_USB_ATI_REMOTE2=m
 CONFIG_USB_ALI_M5632=y
 # CONFIG_USB_CYTHERM is not set
-CONFIG_USB_EGALAX=m
 CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_PHIDGETKIT=m
@@ -2233,7 +2234,6 @@
 CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ACECAD=m
-CONFIG_USB_ITMTOUCH=m
 CONFIG_USB_ATM=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_XUSBATM=m
@@ -2242,6 +2242,9 @@
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
 
+CONFIG_USB_TOUCHSCREEN=m
+
+
 #
 # File systems
 #


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-ia64-generic	26 Mar 2006 00:13:38 -0000	1.23
+++ config-ia64-generic	16 Apr 2006 22:58:48 -0000	1.24
@@ -170,5 +170,5 @@
 # CONFIG_PERMIT_BSP_REMOVE is not set
 # CONFIG_FORCE_CPEI_RETARGET is not set
 
-CONFIG_IA64_NR_NODES=256
+CONFIG_NODES_SHIFT=8