rpms/kernel/devel linux-2.6.11-i2c-config.patch, NONE, 1.1 kernel-2.6.spec, 1.1242, 1.1243

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Apr 16 05:33:38 UTC 2005 

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.11-i2c-config.patch 
Log Message:
Clean up I2C config options.


linux-2.6.11-i2c-config.patch:
 Kconfig |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

--- NEW FILE linux-2.6.11-i2c-config.patch ---
--- linux-2.6.11/drivers/i2c/busses/Kconfig~	2005-04-16 01:05:36.000000000 -0400
+++ linux-2.6.11/drivers/i2c/busses/Kconfig	2005-04-16 01:06:09.000000000 -0400
@@ -376,7 +376,7 @@ config SCx200_I2C_SDA
 
 config SCx200_ACB
 	tristate "NatSemi SCx200 ACCESS.bus"
-	depends on I2C && PCI
+	depends on SCx200_I2C && PCI
 	help
 	  Enable the use of the ACCESS.bus controllers of a SCx200 processor.
 
--- linux-2.6.11/drivers/i2c/busses/Kconfig~	2005-04-16 01:07:57.000000000 -0400
+++ linux-2.6.11/drivers/i2c/busses/Kconfig	2005-04-16 01:11:10.000000000 -0400
@@ -7,7 +7,7 @@ menu "I2C Hardware Bus support"
 
 config I2C_ALI1535
 	tristate "ALI 1535"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on X86 && I2C && PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the SMB
 	  Host controller on Acer Labs Inc. (ALI) M1535 South Bridges.  The SMB
@@ -19,7 +19,7 @@ config I2C_ALI1535
 
 config I2C_ALI1563
 	tristate "ALI 1563"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on X86 && I2C && PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the SMB
 	  Host controller on Acer Labs Inc. (ALI) M1563 South Bridges.  The SMB
@@ -31,7 +31,7 @@ config I2C_ALI1563
 
 config I2C_ALI15X3
 	tristate "ALI 15x3"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on X86 && I2C && PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the
 	  Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
@@ -41,7 +41,7 @@ config I2C_ALI15X3
 
 config I2C_AMD756
 	tristate "AMD 756/766/768/8111 and nVidia nForce"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on X86 && I2C && PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the AMD
 	  756/766/768 mainboard I2C interfaces.  The driver also includes
@@ -53,7 +53,7 @@ config I2C_AMD756
 
 config I2C_AMD756_S4882
 	tristate "SMBus multiplexing on the Tyan S4882"
-	depends on I2C_AMD756 && EXPERIMENTAL
+	depends on X86 && I2C_AMD756 && EXPERIMENTAL
 	help
 	  Enabling this option will add specific SMBus support for the Tyan
 	  S4882 motherboard.  On this 4-CPU board, the SMBus is multiplexed
@@ -66,7 +66,7 @@ config I2C_AMD756_S4882
 
 config I2C_AMD8111
 	tristate "AMD 8111"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on X86 && I2C && PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the
 	  second (SMBus 2.0) AMD 8111 mainboard I2C interface.
@@ -109,7 +109,7 @@ config I2C_HYDRA
 
 config I2C_I801
 	tristate "Intel 82801 (ICH)"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on X86 && I2C && PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the Intel
 	  801 family of mainboard I2C interfaces.  Specifically, the following
@@ -129,7 +129,7 @@ config I2C_I801
 
 config I2C_I810
 	tristate "Intel 810/815"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on X86 && I2C && PCI && EXPERIMENTAL
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the Intel
@@ -145,7 +145,7 @@ config I2C_I810
 
 config I2C_PIIX4
 	tristate "Intel PIIX4"
-	depends on I2C && PCI
+	depends on X86 && I2C && PCI
 	help
 	  If you say yes to this option, support will be included for the Intel
 	  PIIX4 family of mainboard I2C interfaces.  Specifically, the following
@@ -437,7 +437,7 @@ config I2C_STUB
 
 config I2C_VIA
 	tristate "VIA 82C586B"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on (X86 || PPC) && I2C && PCI && EXPERIMENTAL
 	select I2C_ALGOBIT
 	help
 	  If you say yes to this option, support will be included for the VIA
@@ -448,7 +448,7 @@ config I2C_VIA
 
 config I2C_VIAPRO
 	tristate "VIA 82C596/82C686/823x"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on (X86 || PPC) && I2C && PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the VIA
 	  82C596/82C686/823x I2C interfaces.  Specifically, the following 
--- linux-2.6.11/drivers/i2c/busses/Kconfig~	2005-04-16 01:16:48.000000000 -0400
+++ linux-2.6.11/drivers/i2c/busses/Kconfig	2005-04-16 01:17:11.000000000 -0400
@@ -387,7 +387,7 @@ config SCx200_ACB
 
 config I2C_SIS5595
 	tristate "SiS 5595"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on X86 && I2C && PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the 
 	  SiS5595 SMBus (a subset of I2C) interface.
@@ -397,7 +397,7 @@ config I2C_SIS5595
 
 config I2C_SIS630
 	tristate "SiS 630/730"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on X86 && I2C && PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the 
 	  SiS630 and SiS730 SMBus (a subset of I2C) interface.
@@ -407,7 +407,7 @@ config I2C_SIS630
 
 config I2C_SIS96X
 	tristate "SiS 96x"
-	depends on I2C && PCI && EXPERIMENTAL
+	depends on X86 && I2C && PCI && EXPERIMENTAL
 	help
 	  If you say yes to this option, support will be included for the SiS
 	  96x SMBus (a subset of I2C) interfaces.  Specifically, the following


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1242
retrieving revision 1.1243
diff -u -r1.1242 -r1.1243
--- kernel-2.6.spec	16 Apr 2005 03:18:28 -0000	1.1242
+++ kernel-2.6.spec	16 Apr 2005 05:33:33 -0000	1.1243
@@ -305,6 +305,7 @@
 Patch1503: linux-2.6.10-diskdump.patch
 
 # Misc bits.
+Patch1600: linux-2.6.11-i2c-config.patch
 Patch1700: linux-2.6.10-revert-module-invalidparam.patch
 Patch1710: linux-2.6.9-ide-cd-early-EOF.patch
 Patch1720: linux-2.6.9-module_version.patch
@@ -672,6 +673,8 @@
 #
 
 # Misc fixes
+# Make some I2C drivers arch dependant.
+%patch1600 -p1
 # Don't barf on obsolete module parameters.
 %patch1700 -p1
 # Handle early EOF on CD's.
@@ -1107,6 +1110,9 @@
 %endif
 
 %changelog
+* Sat Apr 16 2005 Dave Jones <davej at redhat.com>
+- Make some i2c drivers arch dependant.
+
 * Thu Apr 14 2005 Dave Jones <davej at redhat.com>
 - Build DRM modular. (#154769)

More information about the fedora-cvs-commits mailing list