Subject: linux-next: manual merge of the i2c tree with the pxa tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 22 Jan 2009 11:24:42 +1100

Hi Jean,

Today's linux-next merge of the i2c tree got a conflict in
arch/arm/configs/magician_defconfig between commit
b25a386b9c68ed23c3b2656f44b523e61480218b ("[ARM] pxa/magician: Update
defconfig") from the pxa tree and commit
4f1889016ff7e12fe429ba072be215cbac63e0e0 ("eeprom: More consistent symbol
names") from the i2c tree.

Just changed context, nothing important.  I fixed it up (see below) and
can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

diff --cc arch/arm/configs/magician_defconfig
index dde50df,73ba62b..0000000
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
@@@ -747,11 -675,11 +747,11 @@@ CONFIG_I2C_PXA=
  #
  # Miscellaneous I2C Chip support
  #
 -# CONFIG_SENSORS_DS1337 is not set
 -# CONFIG_SENSORS_DS1374 is not set
  # CONFIG_DS1682 is not set
 +# CONFIG_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
  # CONFIG_SENSORS_PCF8591 is not set
  # CONFIG_SENSORS_MAX6875 is not set