From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 28 Jan 2009 06:15:34 +0000 (+1100)
Subject: Merge commit 'jwb/jwb-merge' into merge
X-Git-Tag: v2.6.29-rc3~1^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=6469c92e0a4879e57bccbbacb2b724672a4fa8fb

Merge commit 'jwb/jwb-merge' into merge

Manual merge of:
	arch/powerpc/configs/44x/warp_defconfig
---

6469c92e0a4879e57bccbbacb2b724672a4fa8fb
diff --cc arch/powerpc/configs/44x/warp_defconfig
index 031ac6d4212f,260c81f98515..3b77f092abe1
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_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