diff options
author | Richard Purdie <richard@openedhand.com> | 2006-11-17 12:08:14 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-11-17 12:08:14 +0000 |
commit | d52270c9cfac981334dd8eff008becb267c127df (patch) | |
tree | 3b375ea1cd1d25a14831022bcefb97de0ce091a4 /meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770 | |
parent | 4a9392f5a3295b900eebc81fd6fd64a8029525df (diff) | |
download | poky-d52270c9cfac981334dd8eff008becb267c127df.tar.gz |
linux-nokia770: Sync with updates in OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@868 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770')
-rw-r--r-- | meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig | 5 |
1 files changed, 2 insertions, 3 deletions
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 315ac831e9..813d07d055 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 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.16-omap1 | 3 | # Linux kernel version: 2.6.16-omap1 |
4 | # Fri May 26 14:02:32 2006 | 4 | # Thu Nov 16 18:24:13 2006 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -200,8 +200,6 @@ CONFIG_ARM_THUMB=y | |||
200 | CONFIG_PREEMPT=y | 200 | CONFIG_PREEMPT=y |
201 | CONFIG_NO_IDLE_HZ=y | 201 | CONFIG_NO_IDLE_HZ=y |
202 | # CONFIG_AEABI is not set | 202 | # CONFIG_AEABI is not set |
203 | CONFIG_OABI_COMPAT=y | ||
204 | # CONFIG_ARTHUR is not set | ||
205 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 203 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
206 | CONFIG_SELECT_MEMORY_MODEL=y | 204 | CONFIG_SELECT_MEMORY_MODEL=y |
207 | CONFIG_FLATMEM_MANUAL=y | 205 | CONFIG_FLATMEM_MANUAL=y |
@@ -245,6 +243,7 @@ CONFIG_FPE_NWFPE=y | |||
245 | CONFIG_BINFMT_ELF=y | 243 | CONFIG_BINFMT_ELF=y |
246 | # CONFIG_BINFMT_AOUT is not set | 244 | # CONFIG_BINFMT_AOUT is not set |
247 | # CONFIG_BINFMT_MISC is not set | 245 | # CONFIG_BINFMT_MISC is not set |
246 | # CONFIG_ARTHUR is not set | ||
248 | 247 | ||
249 | # | 248 | # |
250 | # Power management options | 249 | # Power management options |