[Gc-linux-cvs] linux/drivers/i2c/busses Kconfig, 1.4, 1.5 Makefile, 1.4, 1.5

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

Update of /cvsroot/gc-linux/linux/drivers/i2c/busses
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29988/drivers/i2c/busses

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v.2.6.30.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	25 Oct 2009 18:33:47 -0000	1.4
--- Makefile	25 Oct 2009 18:45:35 -0000	1.5
***************
*** 34,37 ****
--- 34,38 ----
  obj-$(CONFIG_I2C_HIGHLANDER)	+= i2c-highlander.o
  obj-$(CONFIG_I2C_IBM_IIC)	+= i2c-ibm_iic.o
+ obj-$(CONFIG_I2C_IMX)		+= i2c-imx.o
  obj-$(CONFIG_I2C_IOP3XX)	+= i2c-iop3xx.o
  obj-$(CONFIG_I2C_IXP2000)	+= i2c-ixp2000.o
***************
*** 44,47 ****
--- 45,49 ----
  obj-$(CONFIG_I2C_PXA)		+= i2c-pxa.o
  obj-$(CONFIG_I2C_S3C2410)	+= i2c-s3c2410.o
+ obj-$(CONFIG_I2C_S6000)		+= i2c-s6000.o
  obj-$(CONFIG_I2C_SH7760)	+= i2c-sh7760.o
  obj-$(CONFIG_I2C_SH_MOBILE)	+= i2c-sh_mobile.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Kconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Kconfig	25 Oct 2009 18:33:47 -0000	1.4
--- Kconfig	25 Oct 2009 18:45:35 -0000	1.5
***************
*** 133,136 ****
--- 133,137 ----
  	    Serverworks CSB6
  	    Serverworks HT-1000
+ 	    Serverworks HT-1100
  	    SMSC Victory66
  
***************
*** 356,359 ****
--- 357,370 ----
  	  will be called i2c-ibm_iic.
  
+ config I2C_IMX
+ 	tristate "IMX I2C interface"
+ 	depends on ARCH_MXC
+ 	help
+ 	  Say Y here if you want to use the IIC bus controller on
+ 	  the Freescale i.MX/MXC processors.
+ 
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called i2c-imx.
+ 
  config I2C_IOP3XX
  	tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
***************
*** 457,465 ****
  config I2C_S3C2410
  	tristate "S3C2410 I2C Driver"
! 	depends on ARCH_S3C2410
  	help
  	  Say Y here to include support for I2C controller in the
  	  Samsung S3C2410 based System-on-Chip devices.
  
  config I2C_SH7760
  	tristate "Renesas SH7760 I2C Controller"
--- 468,486 ----
  config I2C_S3C2410
  	tristate "S3C2410 I2C Driver"
! 	depends on ARCH_S3C2410 || ARCH_S3C64XX
  	help
  	  Say Y here to include support for I2C controller in the
  	  Samsung S3C2410 based System-on-Chip devices.
  
+ config I2C_S6000
+ 	tristate "S6000 I2C support"
+ 	depends on XTENSA_VARIANT_S6000
+ 	help
+ 	  This driver supports the on chip I2C device on the
+ 	  S6000 xtensa processor family.
+ 
+ 	  To compile this driver as a module, choose M here. The module
+ 	  will be called i2c-s6000.
+ 
  config I2C_SH7760
  	tristate "Renesas SH7760 I2C Controller"
***************
*** 584,593 ****
  
  config I2C_VOODOO3
! 	tristate "Voodoo 3"
  	depends on PCI
  	select I2C_ALGOBIT
  	help
  	  If you say yes to this option, support will be included for the
! 	  Voodoo 3 I2C interface.
  
  	  This driver can also be built as a module.  If so, the module
--- 605,616 ----
  
  config I2C_VOODOO3
! 	tristate "Voodoo 3 (DEPRECATED)"
  	depends on PCI
  	select I2C_ALGOBIT
  	help
  	  If you say yes to this option, support will be included for the
! 	  Voodoo 3 I2C interface. This driver is deprecated and you should
! 	  use the tdfxfb driver instead, which additionally provides
! 	  framebuffer support.
  
  	  This driver can also be built as a module.  If so, the module
***************
*** 618,627 ****
  
  config I2C_PCA_ISA
! 	tristate "PCA9564 on an ISA bus"
  	depends on ISA
  	select I2C_ALGOPCA
  	default n
  	help
! 	  This driver supports ISA boards using the Philips PCA9564
  	  parallel bus to I2C bus controller.
  
--- 641,650 ----
  
  config I2C_PCA_ISA
! 	tristate "PCA9564/PCA9665 on an ISA bus"
  	depends on ISA
  	select I2C_ALGOPCA
  	default n
  	help
! 	  This driver supports ISA boards using the Philips PCA9564/PCA9665
  	  parallel bus to I2C bus controller.
  
***************
*** 635,643 ****
  
  config I2C_PCA_PLATFORM
! 	tristate "PCA9564 as platform device"
  	select I2C_ALGOPCA
  	default n
  	help
! 	  This driver supports a memory mapped Philips PCA9564
  	  parallel bus to I2C bus controller.
  
--- 658,666 ----
  
  config I2C_PCA_PLATFORM
! 	tristate "PCA9564/PCA9665 as platform device"
  	select I2C_ALGOPCA
  	default n
  	help
! 	  This driver supports a memory mapped Philips PCA9564/PCA9665
  	  parallel bus to I2C bus controller.