Merge commit 'jwb/jwb-merge' into merge
Benjamin Herrenschmidt [Wed, 28 Jan 2009 06:15:34 +0000 (17:15 +1100)]
Manual merge of:
arch/powerpc/configs/44x/warp_defconfig

1  2 
arch/powerpc/configs/44x/sam440ep_defconfig
arch/powerpc/configs/44x/warp_defconfig
arch/powerpc/configs/ppc40x_defconfig
arch/powerpc/configs/ppc44x_defconfig

@@@ -660,8 -685,8 +685,8 @@@ CONFIG_I2C_IBM_IIC=
  # Miscellaneous I2C Chip support
  #
  # CONFIG_DS1682 is not set
- # CONFIG_EEPROM_AT24 is not set
 -CONFIG_AT24=y
 -# CONFIG_SENSORS_EEPROM is not set
++CONFIG_EEPROM_AT24=y
 +CONFIG_EEPROM_LEGACY=y
  # CONFIG_SENSORS_PCF8574 is not set
  # CONFIG_PCF8575 is not set
  # CONFIG_SENSORS_PCA9539 is not set
Simple merge
Simple merge