From d52270c9cfac981334dd8eff008becb267c127df Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 17 Nov 2006 12:08:14 +0000
Subject: linux-nokia770: Sync with updates in OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@868 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig')

diff --git a/meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig b/meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig
index 315ac831e..813d07d05 100644
--- a/meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig
+++ b/meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16-omap1
-# Fri May 26 14:02:32 2006
+# Thu Nov 16 18:24:13 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -200,8 +200,6 @@ CONFIG_ARM_THUMB=y
 CONFIG_PREEMPT=y
 CONFIG_NO_IDLE_HZ=y
 # CONFIG_AEABI is not set
-CONFIG_OABI_COMPAT=y
-# CONFIG_ARTHUR is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -245,6 +243,7 @@ CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
 
 #
 # Power management options
-- 
cgit v1.2.3