diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /arch/um/Kconfig.i386 | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/um/Kconfig.i386')
| -rw-r--r-- | arch/um/Kconfig.i386 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386 index e0ac74e5d4c4..717f5d3440e3 100644 --- a/arch/um/Kconfig.i386 +++ b/arch/um/Kconfig.i386 | |||
| @@ -8,6 +8,13 @@ config UML_X86 | |||
| 8 | bool | 8 | bool |
| 9 | default y | 9 | default y |
| 10 | 10 | ||
| 11 | config X86_32 | ||
| 12 | bool | ||
| 13 | default y | ||
| 14 | |||
| 15 | config RWSEM_XCHGADD_ALGORITHM | ||
| 16 | def_bool y | ||
| 17 | |||
| 11 | config 64BIT | 18 | config 64BIT |
| 12 | bool | 19 | bool |
| 13 | default n | 20 | default n |