diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-18 10:07:18 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-18 10:07:18 -0500 |
| commit | e601ef22bc5ec9332c8d785533895ee81c834b8a (patch) | |
| tree | 4685a666fe2a553dccdfe7b4b3f88816d075b29e /include/asm-ia64/sn/sn_feature_sets.h | |
| parent | 27754b34600770beb38e3ae12cb3f345f02e3797 (diff) | |
| parent | bd71c2b17468a2531fb4c81ec1d73520845e97e1 (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 'include/asm-ia64/sn/sn_feature_sets.h')
| -rw-r--r-- | include/asm-ia64/sn/sn_feature_sets.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-ia64/sn/sn_feature_sets.h b/include/asm-ia64/sn/sn_feature_sets.h index 9ca642cad338..ff33e3bd3f8e 100644 --- a/include/asm-ia64/sn/sn_feature_sets.h +++ b/include/asm-ia64/sn/sn_feature_sets.h | |||
| @@ -12,9 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | #include <asm/types.h> | ||
| 16 | #include <asm/bitops.h> | ||
| 17 | |||
| 18 | /* --------------------- PROM Features -----------------------------*/ | 15 | /* --------------------- PROM Features -----------------------------*/ |
| 19 | extern int sn_prom_feature_available(int id); | 16 | extern int sn_prom_feature_available(int id); |
| 20 | 17 | ||