Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 428dcc19 authored by Ben Dooks's avatar Ben Dooks
Browse files

Merge branch 'for-2638/i2c/intel' into for-linus/i2c-2638

parents c5ba47ba e9bc8fa5

drivers/i2c/busses/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -638,6 +638,14 @@ config I2C_XILINX 
	  This driver can also be built as a module.  If so, the module

	  will be called xilinx_i2c.



config I2C_EG20T

        tristate "PCH I2C of Intel EG20T"

        depends on PCI

        help

          This driver is for PCH(Platform controller Hub) I2C of EG20T which

          is an IOH(Input/Output Hub) for x86 embedded processor.

          This driver can access PCH I2C bus device.



comment "External I2C/SMBus adapter drivers"



config I2C_PARPORT

drivers/i2c/busses/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 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

obj-$(CONFIG_I2C_EG20T)         += i2c-eg20t.o



# External I2C/SMBus adapter drivers

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