diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-13 13:15:39 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-13 13:15:39 -0500 |
| commit | da8543ef125afc7bba4da526b61a1ae07dc25109 (patch) | |
| tree | 6aec5867f8e054c22c6208032280ed1434c14a58 /arch/ia64/Kconfig | |
| parent | ec637e3ffb6b978143652477c7c5f96c9519b691 (diff) | |
| parent | 90ac8f7741be4ff66de1f52904f4f67f272f74ce (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index b76ce1fe2e7f..199eeaf0f4e3 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -58,7 +58,7 @@ config IA64_UNCACHED_ALLOCATOR | |||
| 58 | bool | 58 | bool |
| 59 | select GENERIC_ALLOCATOR | 59 | select GENERIC_ALLOCATOR |
| 60 | 60 | ||
| 61 | config ZONE_DMA_IS_DMA32 | 61 | config DMA_IS_DMA32 |
| 62 | bool | 62 | bool |
| 63 | default y | 63 | default y |
| 64 | 64 | ||