projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0411648 0b21bcd)
Merge commit 'jwb/jwb-merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 28 Jan 2009 06:15:34 +0000 (17:15 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
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 patch | diff1 | diff2 | blob | history
arch/powerpc/configs/44x/warp_defconfig patch | diff1 | diff2 | blob | history
arch/powerpc/configs/ppc40x_defconfig patch | diff1 | diff2 | blob | history
arch/powerpc/configs/ppc44x_defconfig patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/configs/44x/warp_defconfig
index 031ac6d4212f836a2b6796508bc523c01b839b14,260c81f985151e7ebb5dc2438c068b6ca4e2c2d3..3b77f092abe12d4ef3c234d0e62a1985ce498a74
--- 1/arch/powerpc/configs/44x/warp_defconfig
--- 2/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
diff --cc arch/powerpc/configs/ppc40x_defconfig
Simple merge
diff --cc arch/powerpc/configs/ppc44x_defconfig
Simple merge
John Crispins staging tree