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
author: Linus Torvalds <torvalds@linux-foundation.org> 2009-01-26 18:11:41 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2009-01-26 18:11:41 -0500
commit: cfb901bf84fe22eb86525e9fb20675b53fb0462a (patch)
tree: e1e710df2c1ba0da26b12f7487fdac6cedc7e166 /arch/sh/configs
parent: 2034563ca323ee45f37a32911550d21c1f1e9626 (diff)
parent: 5fb4523afbffae5a5cec4989ee4c9fbc3dbdef33 (diff)
10 files changed, 19 insertions, 19 deletions
diff --git a/arch/sh/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig
index e21c0e8e22d9..92895013813d 100644
--- a/arch/sh/configs/cayman_defconfig
+++ b/arch/sh/configs/cayman_defconfig
@@ -700,8 +700,8 @@ CONFIG_I2C_HELPER_AUTO=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig
index 240621d8b8d2..14d4b35685a1 100644
--- a/arch/sh/configs/edosk7760_defconfig
+++ b/arch/sh/configs/edosk7760_defconfig
@@ -643,8 +643,8 @@ CONFIG_I2C_SH7760=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig
index 76380ce972bb..7758263514bc 100644
--- a/arch/sh/configs/migor_defconfig
+++ b/arch/sh/configs/migor_defconfig
@@ -701,8 +701,8 @@ CONFIG_I2C_SH_MOBILE=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig
index 5767770ef14d..65b01a9e5934 100644
--- a/arch/sh/configs/r7780mp_defconfig
+++ b/arch/sh/configs/r7780mp_defconfig
@@ -857,8 +857,8 @@ CONFIG_I2C_HIGHLANDER=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig
index ebdf0fc436e4..8defaa5f13b9 100644
--- a/arch/sh/configs/r7785rp_defconfig
+++ b/arch/sh/configs/r7785rp_defconfig
@@ -862,8 +862,8 @@ CONFIG_I2C_HIGHLANDER=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig
index 47ff060995b8..d6680f4382c2 100644
--- a/arch/sh/configs/rts7751r2d1_defconfig
+++ b/arch/sh/configs/rts7751r2d1_defconfig
@@ -798,7 +798,7 @@ CONFIG_SPI_SH_SCI=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig
index 1566870dc805..3fca10e24833 100644
--- a/arch/sh/configs/rts7751r2dplus_defconfig
+++ b/arch/sh/configs/rts7751r2dplus_defconfig
@@ -798,7 +798,7 @@ CONFIG_SPI_SH_SCI=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig
index 1b93d442134c..390052577031 100644
--- a/arch/sh/configs/se7343_defconfig
+++ b/arch/sh/configs/se7343_defconfig
@@ -669,8 +669,8 @@ CONFIG_I2C_SH_MOBILE=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig
index 7a10164ceddb..1d63628df6f6 100644
--- a/arch/sh/configs/sh7785lcr_defconfig
+++ b/arch/sh/configs/sh7785lcr_defconfig
@@ -834,8 +834,8 @@ CONFIG_I2C_PCA_PLATFORM=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
index e0d7682e4f19..ed90a7e81099 100644
--- a/arch/sh/configs/shx3_defconfig
+++ b/arch/sh/configs/shx3_defconfig
@@ -670,8 +670,8 @@ CONFIG_I2C_HELPER_AUTO=y
 # Miscellaneous I2C Chip support
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
+# CONFIG_EEPROM_AT24 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_SENSORS_PCA9539 is not set
@@ -695,7 +695,7 @@ CONFIG_SPI_MASTER=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_AT25 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
author	Linus Torvalds <torvalds@linux-foundation.org>	2009-01-26 18:11:41 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2009-01-26 18:11:41 -0500
commit	cfb901bf84fe22eb86525e9fb20675b53fb0462a (patch)
tree	e1e710df2c1ba0da26b12f7487fdac6cedc7e166 /arch/sh/configs
parent	2034563ca323ee45f37a32911550d21c1f1e9626 (diff)
parent	5fb4523afbffae5a5cec4989ee4c9fbc3dbdef33 (diff)

diff --git a/arch/sh/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig index e21c0e8e22d9..92895013813d 100644 --- a/arch/sh/configs/cayman_defconfig +++ b/arch/sh/configs/cayman_defconfig
@@ -700,8 +700,8 @@ CONFIG_I2C_HELPER_AUTO=y
700	# Miscellaneous I2C Chip support	700	# Miscellaneous I2C Chip support
701	#	701	#
702	# CONFIG_DS1682 is not set	702	# CONFIG_DS1682 is not set
703	# CONFIG_AT24 is not set	703	# CONFIG_EEPROM_AT24 is not set
704	# CONFIG_SENSORS_EEPROM is not set	704	# CONFIG_EEPROM_LEGACY is not set
705	# CONFIG_SENSORS_PCF8574 is not set	705	# CONFIG_SENSORS_PCF8574 is not set
706	# CONFIG_PCF8575 is not set	706	# CONFIG_PCF8575 is not set
707	# CONFIG_SENSORS_PCA9539 is not set	707	# CONFIG_SENSORS_PCA9539 is not set


diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig index 240621d8b8d2..14d4b35685a1 100644 --- a/arch/sh/configs/edosk7760_defconfig +++ b/arch/sh/configs/edosk7760_defconfig
@@ -643,8 +643,8 @@ CONFIG_I2C_SH7760=y
643	# Miscellaneous I2C Chip support	643	# Miscellaneous I2C Chip support
644	#	644	#
645	# CONFIG_DS1682 is not set	645	# CONFIG_DS1682 is not set
646	# CONFIG_AT24 is not set	646	# CONFIG_EEPROM_AT24 is not set
647	# CONFIG_SENSORS_EEPROM is not set	647	# CONFIG_EEPROM_LEGACY is not set
648	# CONFIG_SENSORS_PCF8574 is not set	648	# CONFIG_SENSORS_PCF8574 is not set
649	# CONFIG_PCF8575 is not set	649	# CONFIG_PCF8575 is not set
650	# CONFIG_SENSORS_PCA9539 is not set	650	# CONFIG_SENSORS_PCA9539 is not set


diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig index 76380ce972bb..7758263514bc 100644 --- a/arch/sh/configs/migor_defconfig +++ b/arch/sh/configs/migor_defconfig
@@ -701,8 +701,8 @@ CONFIG_I2C_SH_MOBILE=y
701	# Miscellaneous I2C Chip support	701	# Miscellaneous I2C Chip support
702	#	702	#
703	# CONFIG_DS1682 is not set	703	# CONFIG_DS1682 is not set
704	# CONFIG_AT24 is not set	704	# CONFIG_EEPROM_AT24 is not set
705	# CONFIG_SENSORS_EEPROM is not set	705	# CONFIG_EEPROM_LEGACY is not set
706	# CONFIG_SENSORS_PCF8574 is not set	706	# CONFIG_SENSORS_PCF8574 is not set
707	# CONFIG_PCF8575 is not set	707	# CONFIG_PCF8575 is not set
708	# CONFIG_SENSORS_PCA9539 is not set	708	# CONFIG_SENSORS_PCA9539 is not set


diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig index 5767770ef14d..65b01a9e5934 100644 --- a/arch/sh/configs/r7780mp_defconfig +++ b/arch/sh/configs/r7780mp_defconfig
@@ -857,8 +857,8 @@ CONFIG_I2C_HIGHLANDER=y
857	# Miscellaneous I2C Chip support	857	# Miscellaneous I2C Chip support
858	#	858	#
859	# CONFIG_DS1682 is not set	859	# CONFIG_DS1682 is not set
860	# CONFIG_AT24 is not set	860	# CONFIG_EEPROM_AT24 is not set
861	# CONFIG_SENSORS_EEPROM is not set	861	# CONFIG_EEPROM_LEGACY is not set
862	# CONFIG_SENSORS_PCF8574 is not set	862	# CONFIG_SENSORS_PCF8574 is not set
863	# CONFIG_PCF8575 is not set	863	# CONFIG_PCF8575 is not set
864	# CONFIG_SENSORS_PCA9539 is not set	864	# CONFIG_SENSORS_PCA9539 is not set


diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig index ebdf0fc436e4..8defaa5f13b9 100644 --- a/arch/sh/configs/r7785rp_defconfig +++ b/arch/sh/configs/r7785rp_defconfig
@@ -862,8 +862,8 @@ CONFIG_I2C_HIGHLANDER=y
862	# Miscellaneous I2C Chip support	862	# Miscellaneous I2C Chip support
863	#	863	#
864	# CONFIG_DS1682 is not set	864	# CONFIG_DS1682 is not set
865	# CONFIG_AT24 is not set	865	# CONFIG_EEPROM_AT24 is not set
866	# CONFIG_SENSORS_EEPROM is not set	866	# CONFIG_EEPROM_LEGACY is not set
867	# CONFIG_SENSORS_PCF8574 is not set	867	# CONFIG_SENSORS_PCF8574 is not set
868	# CONFIG_PCF8575 is not set	868	# CONFIG_PCF8575 is not set
869	# CONFIG_SENSORS_PCA9539 is not set	869	# CONFIG_SENSORS_PCA9539 is not set


diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig index 47ff060995b8..d6680f4382c2 100644 --- a/arch/sh/configs/rts7751r2d1_defconfig +++ b/arch/sh/configs/rts7751r2d1_defconfig
@@ -798,7 +798,7 @@ CONFIG_SPI_SH_SCI=y
798	#	798	#
799	# SPI Protocol Masters	799	# SPI Protocol Masters
800	#	800	#
801	# CONFIG_SPI_AT25 is not set	801	# CONFIG_EEPROM_AT25 is not set
802	# CONFIG_SPI_SPIDEV is not set	802	# CONFIG_SPI_SPIDEV is not set
803	# CONFIG_SPI_TLE62X0 is not set	803	# CONFIG_SPI_TLE62X0 is not set
804	# CONFIG_W1 is not set	804	# CONFIG_W1 is not set


diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig index 1566870dc805..3fca10e24833 100644 --- a/arch/sh/configs/rts7751r2dplus_defconfig +++ b/arch/sh/configs/rts7751r2dplus_defconfig
@@ -798,7 +798,7 @@ CONFIG_SPI_SH_SCI=y
798	#	798	#
799	# SPI Protocol Masters	799	# SPI Protocol Masters
800	#	800	#
801	# CONFIG_SPI_AT25 is not set	801	# CONFIG_EEPROM_AT25 is not set
802	# CONFIG_SPI_SPIDEV is not set	802	# CONFIG_SPI_SPIDEV is not set
803	# CONFIG_SPI_TLE62X0 is not set	803	# CONFIG_SPI_TLE62X0 is not set
804	# CONFIG_W1 is not set	804	# CONFIG_W1 is not set


diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig index 1b93d442134c..390052577031 100644 --- a/arch/sh/configs/se7343_defconfig +++ b/arch/sh/configs/se7343_defconfig
@@ -669,8 +669,8 @@ CONFIG_I2C_SH_MOBILE=y
669	# Miscellaneous I2C Chip support	669	# Miscellaneous I2C Chip support
670	#	670	#
671	# CONFIG_DS1682 is not set	671	# CONFIG_DS1682 is not set
672	# CONFIG_AT24 is not set	672	# CONFIG_EEPROM_AT24 is not set
673	# CONFIG_SENSORS_EEPROM is not set	673	# CONFIG_EEPROM_LEGACY is not set
674	# CONFIG_SENSORS_PCF8574 is not set	674	# CONFIG_SENSORS_PCF8574 is not set
675	# CONFIG_PCF8575 is not set	675	# CONFIG_PCF8575 is not set
676	# CONFIG_SENSORS_PCA9539 is not set	676	# CONFIG_SENSORS_PCA9539 is not set


diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig index 7a10164ceddb..1d63628df6f6 100644 --- a/arch/sh/configs/sh7785lcr_defconfig +++ b/arch/sh/configs/sh7785lcr_defconfig
@@ -834,8 +834,8 @@ CONFIG_I2C_PCA_PLATFORM=y
834	# Miscellaneous I2C Chip support	834	# Miscellaneous I2C Chip support
835	#	835	#
836	# CONFIG_DS1682 is not set	836	# CONFIG_DS1682 is not set
837	# CONFIG_AT24 is not set	837	# CONFIG_EEPROM_AT24 is not set
838	# CONFIG_SENSORS_EEPROM is not set	838	# CONFIG_EEPROM_LEGACY is not set
839	# CONFIG_SENSORS_PCF8574 is not set	839	# CONFIG_SENSORS_PCF8574 is not set
840	# CONFIG_PCF8575 is not set	840	# CONFIG_PCF8575 is not set
841	# CONFIG_SENSORS_PCA9539 is not set	841	# CONFIG_SENSORS_PCA9539 is not set


diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig index e0d7682e4f19..ed90a7e81099 100644 --- a/arch/sh/configs/shx3_defconfig +++ b/arch/sh/configs/shx3_defconfig
@@ -670,8 +670,8 @@ CONFIG_I2C_HELPER_AUTO=y
670	# Miscellaneous I2C Chip support	670	# Miscellaneous I2C Chip support
671	#	671	#
672	# CONFIG_DS1682 is not set	672	# CONFIG_DS1682 is not set
673	# CONFIG_AT24 is not set	673	# CONFIG_EEPROM_AT24 is not set
674	# CONFIG_SENSORS_EEPROM is not set	674	# CONFIG_EEPROM_LEGACY is not set
675	# CONFIG_SENSORS_PCF8574 is not set	675	# CONFIG_SENSORS_PCF8574 is not set
676	# CONFIG_PCF8575 is not set	676	# CONFIG_PCF8575 is not set
677	# CONFIG_SENSORS_PCA9539 is not set	677	# CONFIG_SENSORS_PCA9539 is not set
@@ -695,7 +695,7 @@ CONFIG_SPI_MASTER=y
695	#	695	#
696	# SPI Protocol Masters	696	# SPI Protocol Masters
697	#	697	#
698	# CONFIG_SPI_AT25 is not set	698	# CONFIG_EEPROM_AT25 is not set
699	# CONFIG_SPI_SPIDEV is not set	699	# CONFIG_SPI_SPIDEV is not set
700	# CONFIG_SPI_TLE62X0 is not set	700	# CONFIG_SPI_TLE62X0 is not set
701	# CONFIG_W1 is not set	701	# CONFIG_W1 is not set