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

Commit cfb901bf authored Jan 26, 2009 by Linus Torvalds

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Warn on deprecated binding model use
  eeprom: More consistent symbol names
  eeprom: Move 93cx6 eeprom driver to /drivers/misc/eeprom
  spi: Move at25 (for SPI eeproms) to /drivers/misc/eeprom
  i2c: Move old eeprom driver to /drivers/misc/eeprom
  i2c: Move at24 to drivers/misc/eeprom
  i2c: Quilt tree has moved
  i2c: Delete many unused adapter IDs
  i2c: Delete 10 unused driver IDs

parents 2034563c 5fb4523a

MAINTAINERS

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2102,7 +2102,8 @@ M: khali@linux-fr.org
	P: Ben Dooks (embedded platforms)		P: Ben Dooks (embedded platforms)
	M: ben-linux@fluff.org		M: ben-linux@fluff.org
	L: linux-i2c@vger.kernel.org		L: linux-i2c@vger.kernel.org
	T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/		W: http://i2c.wiki.kernel.org/
			T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
	S: Maintained		S: Maintained

	I2C-TINY-USB DRIVER		I2C-TINY-USB DRIVER

arch/arm/configs/afeb9260_defconfig

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -719,8 +719,8 @@ CONFIG_I2C_GPIO=y
	# Miscellaneous I2C Chip support		# Miscellaneous I2C Chip support
	#		#
	# CONFIG_DS1682 is not set		# CONFIG_DS1682 is not set
	CONFIG_AT24=y		CONFIG_EEPROM_AT24=y
	# CONFIG_SENSORS_EEPROM is not set		# CONFIG_EEPROM_LEGACY is not set
	# CONFIG_SENSORS_PCF8574 is not set		# CONFIG_SENSORS_PCF8574 is not set
	# CONFIG_PCF8575 is not set		# CONFIG_PCF8575 is not set
	# CONFIG_SENSORS_PCA9539 is not set		# CONFIG_SENSORS_PCA9539 is not set
	@@ -744,7 +744,7 @@ CONFIG_SPI_ATMEL=y
	#		#
	# SPI Protocol Masters		# SPI Protocol Masters
	#		#
	# CONFIG_SPI_AT25 is not set		# CONFIG_EEPROM_AT25 is not set
	CONFIG_SPI_SPIDEV=y		CONFIG_SPI_SPIDEV=y
	# CONFIG_SPI_TLE62X0 is not set		# CONFIG_SPI_TLE62X0 is not set
	# CONFIG_W1 is not set		# CONFIG_W1 is not set

arch/arm/configs/ams_delta_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -767,7 +767,7 @@ CONFIG_I2C_OMAP=y
	#		#
	# CONFIG_SENSORS_DS1337 is not set		# CONFIG_SENSORS_DS1337 is not set
	# CONFIG_SENSORS_DS1374 is not set		# CONFIG_SENSORS_DS1374 is not set
	# CONFIG_SENSORS_EEPROM is not set		# CONFIG_EEPROM_LEGACY is not set
	# CONFIG_SENSORS_PCF8574 is not set		# CONFIG_SENSORS_PCF8574 is not set
	# CONFIG_SENSORS_PCA9539 is not set		# CONFIG_SENSORS_PCA9539 is not set
	# CONFIG_SENSORS_PCF8591 is not set		# CONFIG_SENSORS_PCF8591 is not set

arch/arm/configs/at91cap9adk_defconfig

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -676,7 +676,7 @@ CONFIG_I2C_CHARDEV=y
	# CONFIG_SENSORS_DS1337 is not set		# CONFIG_SENSORS_DS1337 is not set
	# CONFIG_SENSORS_DS1374 is not set		# CONFIG_SENSORS_DS1374 is not set
	# CONFIG_DS1682 is not set		# CONFIG_DS1682 is not set
	# CONFIG_SENSORS_EEPROM is not set		# CONFIG_EEPROM_LEGACY is not set
	# CONFIG_SENSORS_PCF8574 is not set		# CONFIG_SENSORS_PCF8574 is not set
	# CONFIG_SENSORS_PCA9539 is not set		# CONFIG_SENSORS_PCA9539 is not set
	# CONFIG_SENSORS_PCF8591 is not set		# CONFIG_SENSORS_PCF8591 is not set
	@@ -703,7 +703,7 @@ CONFIG_SPI_ATMEL=y
	#		#
	# SPI Protocol Masters		# SPI Protocol Masters
	#		#
	# CONFIG_SPI_AT25 is not set		# CONFIG_EEPROM_AT25 is not set
	# CONFIG_SPI_SPIDEV is not set		# CONFIG_SPI_SPIDEV is not set
	# CONFIG_SPI_TLE62X0 is not set		# CONFIG_SPI_TLE62X0 is not set
	# CONFIG_W1 is not set		# CONFIG_W1 is not set

arch/arm/configs/at91rm9200dk_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -636,7 +636,7 @@ CONFIG_I2C_GPIO=y
	#		#
	# CONFIG_SENSORS_DS1337 is not set		# CONFIG_SENSORS_DS1337 is not set
	# CONFIG_SENSORS_DS1374 is not set		# CONFIG_SENSORS_DS1374 is not set
	# CONFIG_SENSORS_EEPROM is not set		# CONFIG_EEPROM_LEGACY is not set
	# CONFIG_SENSORS_PCF8574 is not set		# CONFIG_SENSORS_PCF8574 is not set
	# CONFIG_SENSORS_PCA9539 is not set		# CONFIG_SENSORS_PCA9539 is not set
	# CONFIG_SENSORS_PCF8591 is not set		# CONFIG_SENSORS_PCF8591 is not set