diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 17:14:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 17:14:02 -0500 |
| commit | 9aef3b7c208b216b54a2e6614c6287ca8a09cf6f (patch) | |
| tree | 0d6b41a55c4e6a4dd1135d76aeb8b12c7b9841bb /include | |
| parent | e0ae23550ffd3bfe319fa66879779be1a9a4a155 (diff) | |
| parent | 61d67f2e07d96d20d86135792ca591c491939c27 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/sn/sn_feature_sets.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/asm-ia64/sn/sn_feature_sets.h b/include/asm-ia64/sn/sn_feature_sets.h index e68a80853d5d..9ca642cad338 100644 --- a/include/asm-ia64/sn/sn_feature_sets.h +++ b/include/asm-ia64/sn/sn_feature_sets.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * License. See the file "COPYING" in the main directory of this archive | 8 | * License. See the file "COPYING" in the main directory of this archive |
| 9 | * for more details. | 9 | * for more details. |
| 10 | * | 10 | * |
| 11 | * Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved. | 11 | * Copyright (c) 2005-2006 Silicon Graphics, Inc. All rights reserved. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | 14 | ||
| @@ -27,14 +27,12 @@ extern int sn_prom_feature_available(int id); | |||
| 27 | * "false" for new features. | 27 | * "false" for new features. |
| 28 | * | 28 | * |
| 29 | * Use: | 29 | * Use: |
| 30 | * if (sn_prom_feature_available(PRF_FEATURE_XXX)) | 30 | * if (sn_prom_feature_available(PRF_XXX)) |
| 31 | * ... | 31 | * ... |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | /* | 34 | #define PRF_PAL_CACHE_FLUSH_SAFE 0 |
| 35 | * Example: feature XXX | 35 | #define PRF_DEVICE_FLUSH_LIST 1 |
| 36 | */ | ||
| 37 | #define PRF_FEATURE_XXX 0 | ||
| 38 | 36 | ||
| 39 | 37 | ||
| 40 | 38 | ||
| @@ -51,7 +49,7 @@ extern int sn_prom_feature_available(int id); | |||
| 51 | * | 49 | * |
| 52 | * By default, features are disabled unless explicitly enabled. | 50 | * By default, features are disabled unless explicitly enabled. |
| 53 | */ | 51 | */ |
| 54 | #define OSF_MCA_SLV_TO_OS_INIT_SLV 0 | 52 | #define OSF_MCA_SLV_TO_OS_INIT_SLV 0 |
| 55 | #define OSF_FEAT_LOG_SBES 1 | 53 | #define OSF_FEAT_LOG_SBES 1 |
| 56 | 54 | ||
| 57 | #endif /* _ASM_IA64_SN_FEATURE_SETS_H */ | 55 | #endif /* _ASM_IA64_SN_FEATURE_SETS_H */ |