diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-14 22:56:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-14 22:56:02 -0500 |
| commit | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (patch) | |
| tree | 980297c1747ca89354bc879cc5d17903eacb19e2 /arch/ia64 | |
| parent | 0174f72f848dfe7dc7488799776303c81b181b16 (diff) | |
| parent | d3ee871e63d0a0c70413dc0aa5534b8d6cd6ec37 (diff) | |
Merge x86-64 update from Andi
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 8796e12c56f3..b76ce1fe2e7f 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -58,6 +58,10 @@ config IA64_UNCACHED_ALLOCATOR | |||
| 58 | bool | 58 | bool |
| 59 | select GENERIC_ALLOCATOR | 59 | select GENERIC_ALLOCATOR |
| 60 | 60 | ||
| 61 | config ZONE_DMA_IS_DMA32 | ||
| 62 | bool | ||
| 63 | default y | ||
| 64 | |||
| 61 | choice | 65 | choice |
| 62 | prompt "System type" | 66 | prompt "System type" |
| 63 | default IA64_GENERIC | 67 | default IA64_GENERIC |