diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /arch/um/Kconfig_x86_64 | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/Kconfig_x86_64')
| -rw-r--r-- | arch/um/Kconfig_x86_64 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/um/Kconfig_x86_64 b/arch/um/Kconfig_x86_64 index 768dc6626a8d..fd8d7e8982b1 100644 --- a/arch/um/Kconfig_x86_64 +++ b/arch/um/Kconfig_x86_64 | |||
| @@ -1,4 +1,8 @@ | |||
| 1 | config 64_BIT | 1 | config UML_X86 |
| 2 | bool | ||
| 3 | default y | ||
| 4 | |||
| 5 | config 64BIT | ||
| 2 | bool | 6 | bool |
| 3 | default y | 7 | default y |
| 4 | 8 | ||