diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 02:46:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 02:46:39 +0300 |
| commit | c03296a868ae7c91aa2d8b372184763b18f16d7a (patch) | |
| tree | 57ff0b44a412b78fe598a49cc28b3cebf51f1154 /arch/ia64/Kconfig | |
| parent | e3f749c4af69c4344d89f11e2293e3790eb4eaca (diff) | |
| parent | 913e4a75572354995b330f57082d9a86250cd75f (diff) | |
| download | linux-c03296a868ae7c91aa2d8b372184763b18f16d7a.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
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 default "7" if MCKINLEY default "6" if ITANIUM -# align cache-sensitive data to 64 bytes config IA64_CYCLONE bool "Cyclone (EXA) Time Source support" help @@ -374,6 +373,9 @@ config IA64_PALINFO To use this option, you have to ensure that the "/proc file system support" (CONFIG_PROC_FS) is enabled, too. +config SGI_SN + def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) + source "drivers/firmware/Kconfig" source "fs/Kconfig.binfmt" |