Commit 3f4ae860 authored by Ben Dooks's avatar Ben Dooks
Browse files

Merge branch 'next-i2c-xilinx' into next-i2c

parents 2086f848 e1d5b659

drivers/i2c/busses/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -581,6 +581,16 @@ config I2C_OCTEON 
	  This driver can also be built as a module.  If so, the module

	  will be called i2c-octeon.



config I2C_XILINX

	tristate "Xilinx I2C Controller"

	depends on EXPERIMENTAL && HAS_IOMEM

	help

	  If you say yes to this option, support will be included for the

	  Xilinx I2C controller.



	  This driver can also be built as a module.  If so, the module

	  will be called xilinx_i2c.



comment "External I2C/SMBus adapter drivers"



config I2C_PARPORT

drivers/i2c/busses/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ obj-$(CONFIG_I2C_SIMTEC) += i2c-simtec.o 
obj-$(CONFIG_I2C_STU300)	+= i2c-stu300.o

obj-$(CONFIG_I2C_VERSATILE)	+= i2c-versatile.o

obj-$(CONFIG_I2C_OCTEON)	+= i2c-octeon.o

obj-$(CONFIG_I2C_XILINX)	+= i2c-xiic.o



# External I2C/SMBus adapter drivers

obj-$(CONFIG_I2C_PARPORT)	+= i2c-parport.o

drivers/i2c/busses/i2c-xiic.c

0 → 100644
+824 −0

File added.

Preview size limit exceeded, changes collapsed.