diff options
| author | Steven Whitehouse <steve@men-an-tol.chygwyn.com> | 2006-02-23 04:49:43 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-23 04:49:43 -0500 |
| commit | d35462b4bb847b68321c55e95c926aa485aecce2 (patch) | |
| tree | b08e18bf6e672633402871ee763102fdb5e63229 /arch/ia64/Kconfig | |
| parent | 91ffd7db71e7451f89941a8f428b4daa2a7c1e38 (diff) | |
| parent | 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 199eeaf0f4e3..845cd0902a50 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -194,7 +194,6 @@ config IA64_L1_CACHE_SHIFT | |||
| 194 | default "7" if MCKINLEY | 194 | default "7" if MCKINLEY |
| 195 | default "6" if ITANIUM | 195 | default "6" if ITANIUM |
| 196 | 196 | ||
| 197 | # align cache-sensitive data to 64 bytes | ||
| 198 | config IA64_CYCLONE | 197 | config IA64_CYCLONE |
| 199 | bool "Cyclone (EXA) Time Source support" | 198 | bool "Cyclone (EXA) Time Source support" |
| 200 | help | 199 | help |
| @@ -374,6 +373,9 @@ config IA64_PALINFO | |||
| 374 | To use this option, you have to ensure that the "/proc file system | 373 | To use this option, you have to ensure that the "/proc file system |
| 375 | support" (CONFIG_PROC_FS) is enabled, too. | 374 | support" (CONFIG_PROC_FS) is enabled, too. |
| 376 | 375 | ||
| 376 | config SGI_SN | ||
| 377 | def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) | ||
| 378 | |||
| 377 | source "drivers/firmware/Kconfig" | 379 | source "drivers/firmware/Kconfig" |
| 378 | 380 | ||
| 379 | source "fs/Kconfig.binfmt" | 381 | source "fs/Kconfig.binfmt" |