rpms/kernel/devel/configs config-generic, 1.14, 1.15 config-ppc-generic, 1.8, 1.9 config-ppc64-generic, 1.3, 1.4 config-x86-generic, 1.4, 1.5 config-x86_64-generic, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	config-generic config-ppc-generic config-ppc64-generic 
	config-x86-generic config-x86_64-generic 
Log Message:
Clean up I2C config options.



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-generic	14 Apr 2005 05:28:26 -0000	1.14
+++ config-generic	16 Apr 2005 05:33:35 -0000	1.15
@@ -1456,24 +1456,14 @@
 #
 # I2C Hardware Bus support
 #
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
-CONFIG_I2C_ISA=m
+
 CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_PIIX4=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
-# CONFIG_SCx200_ACB is not set
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
 CONFIG_I2C_VOODOO3=m
+
+# CONFIG_I2C_ISA is not set
+
 # CONFIG_I2C_ELEKTOR is not set
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
@@ -1481,14 +1471,10 @@
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
 # CONFIG_I2C_PARPORT is not set
-CONFIG_I2C_ALI1563=m
 # CONFIG_I2C_PARPORT_LIGHT is not set
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_PCA_ISA=m
-CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_STUB=m
-# disabled Jan 18th - incomplete merge.
-# CONFIG_I2C_MPC is not set
 
 #
 # I2C Hardware Sensors Chip support


Index: config-ppc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-ppc-generic	31 Mar 2005 20:28:21 -0000	1.8
+++ config-ppc-generic	16 Apr 2005 05:33:35 -0000	1.9
@@ -34,9 +34,9 @@
 # CONFIG_PPC601_SYNC_FIX is not set
 CONFIG_PPC_STD_MMU=y
 
-# FIXME: BUILD_BREAK 20/Jan/2005
-# drivers/i2c/busses/i2c-mpc.c:28:31: linux/fsl_devices.h: No such file or directory
-# CONFIG_I2C_MPC is not set
+CONFIG_I2C_MPC=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
 
 # Platform options
 CONFIG_PPC_MULTIPLATFORM=y


Index: config-ppc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc64-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-ppc64-generic	19 Mar 2005 00:49:28 -0000	1.3
+++ config-ppc64-generic	16 Apr 2005 05:33:35 -0000	1.4
@@ -101,3 +101,8 @@
 
 # CONFIG_BLK_DEV_VIA82CXXX is not set
 CONFIG_PMAC_SMU=y
+
+CONFIG_I2C_MPC=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-x86-generic	8 Apr 2005 07:04:31 -0000	1.4
+++ config-x86-generic	16 Apr 2005 05:33:35 -0000	1.5
@@ -93,6 +93,8 @@
 CONFIG_HP100=m
 CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_ADVANSYS=m
+
 CONFIG_CRASH=m
 CONFIG_CAPI_EICON=y
 
@@ -147,6 +149,18 @@
 #
 # CPUFreq processor drivers
 #
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEBUG=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+
 CONFIG_X86_ACPI_CPUFREQ=m
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 CONFIG_X86_POWERNOW_K6=m
@@ -185,18 +199,6 @@
 # CONFIG_SOFTWARE_SUSPEND is not set
 # CONFIG_PM_DEBUG is not set
 
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEBUG=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
 # CONFIG_DEBUG_PAGEALLOC is not set
@@ -237,4 +239,25 @@
 
 CONFIG_BLK_DEV_AMD74XX=y
 
-CONFIG_SCSI_ADVANSYS=m
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_I810=m
+CONFIG_I2C_ISA=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_PROSAVAGE=m
+CONFIG_I2C_SAVAGE4=m
+# CONFIG_SCx200_ACB is not set
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_ISA=m
+CONFIG_I2C_VOODOO3=m
+


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-x86_64-generic	6 Feb 2005 05:49:11 -0000	1.1
+++ config-x86_64-generic	16 Apr 2005 05:33:35 -0000	1.2
@@ -119,3 +119,17 @@
 
 # CONFIG_PNP is not set
 
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+CONFIG_I2C_AMD8111=m
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+# CONFIG_I2C_VIAPRO is not set
+