[Gc-linux-cvs] linux/drivers/i2c/busses Kconfig, 1.10, 1.11 Makefile, 1.10, 1.11

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/i2c/busses
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/drivers/i2c/busses

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v2.6.32.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile	9 Dec 2009 18:18:07 -0000	1.10
--- Makefile	9 Dec 2009 18:40:09 -0000	1.11
***************
*** 3,6 ****
--- 3,9 ----
  #
  
+ # ACPI drivers
+ obj-$(CONFIG_I2C_SCMI)		+= i2c-scmi.o
+ 
  # PC SMBus host controller drivers
  obj-$(CONFIG_I2C_ALI1535)	+= i2c-ali1535.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Kconfig,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Kconfig	9 Dec 2009 18:18:07 -0000	1.10
--- Kconfig	9 Dec 2009 18:40:09 -0000	1.11
***************
*** 114,118 ****
  
  config I2C_PIIX4
! 	tristate "Intel PIIX4 and compatible (ATI/Serverworks/Broadcom/SMSC)"
  	depends on PCI
  	help
--- 114,118 ----
  
  config I2C_PIIX4
! 	tristate "Intel PIIX4 and compatible (ATI/AMD/Serverworks/Broadcom/SMSC)"
  	depends on PCI
  	help
***************
*** 129,132 ****
--- 129,133 ----
  	    ATI SB700
  	    ATI SB800
+ 	    AMD Hudson-2
  	    Serverworks OSB4
  	    Serverworks CSB5
***************
*** 232,235 ****
--- 233,252 ----
  	  will be called i2c-viapro.
  
+ if ACPI
+ 
+ comment "ACPI drivers"
+ 
+ config I2C_SCMI
+ 	tristate "SMBus Control Method Interface"
+ 	help
+ 	  This driver supports the SMBus Control Method Interface. It needs the
+ 	  BIOS to declare ACPI control methods as described in the SMBus Control
+ 	  Method Interface specification.
+ 
+ 	  To compile this driver as a module, choose M here:
+ 	  the module will be called i2c-scmi.
+ 
+ endif # ACPI
+ 
  comment "Mac SMBus host controller drivers"
  	depends on PPC_CHRP || PPC_PMAC
***************
*** 461,466 ****
  
  config I2C_PXA
! 	tristate "Intel PXA2XX I2C adapter (EXPERIMENTAL)"
! 	depends on EXPERIMENTAL && ARCH_PXA
  	help
  	  If you have devices in the PXA I2C bus, say yes to this option.
--- 478,483 ----
  
  config I2C_PXA
! 	tristate "Intel PXA2XX I2C adapter"
! 	depends on ARCH_PXA || ARCH_MMP
  	help
  	  If you have devices in the PXA I2C bus, say yes to this option.