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 --- .../linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz') diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz index b9eac8ae2..cc9f6e698 100644 --- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz +++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz @@ -217,9 +217,9 @@ CONFIG_PCMCIA_PXA2XX=y # # Kernel Features # -# CONFIG_TICK_ONESHOT is not set -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_PREEMPT=y CONFIG_HZ=100 @@ -297,7 +297,7 @@ CONFIG_PACKET=m CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set +CONFIG_XFRM_USER=m # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set # CONFIG_NET_KEY is not set @@ -917,7 +917,7 @@ CONFIG_I2C_BOARDINFO=y # # I2C Algorithms # -# CONFIG_I2C_ALGOBIT is not set +CONFIG_I2C_ALGOBIT=y # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALGOPCA is not set @@ -971,6 +971,8 @@ CONFIG_SSB_POSSIBLE=y # Multifunction device drivers # # CONFIG_MFD_SM501 is not set +# CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_ASIC3_DS1WM is not set # # Multimedia devices @@ -1078,8 +1080,8 @@ CONFIG_FONT_8x16=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