From 8c25ace84e05394e828d4463a4d2dece6dea58fe Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 21 Jan 2008 01:02:28 +0000 Subject: linux-rp-2.6.23+2.6.24: Further defconfig merging git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3561 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000') diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000 index 5502152a7..f9317ba2a 100644 --- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000 +++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000 @@ -908,14 +908,14 @@ CONFIG_HW_RANDOM=m # CONFIG_CARDMAN_4040 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set -CONFIG_I2C=m +CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_CHARDEV is not set # # I2C Algorithms # -# CONFIG_I2C_ALGOBIT is not set +CONFIG_I2C_ALGOBIT=y # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALGOPCA is not set @@ -923,7 +923,7 @@ CONFIG_I2C_BOARDINFO=y # I2C Hardware Bus support # # CONFIG_I2C_GPIO is not set -CONFIG_I2C_PXA=m +CONFIG_I2C_PXA=y # CONFIG_I2C_PXA_SLAVE is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set @@ -1078,8 +1078,8 @@ CONFIG_FONT_MINI_4x6=y # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set CONFIG_LOGO_OHAND_CLUT224=y -- cgit v1.2.3