diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-02-27 19:35:48 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-02-27 19:35:48 -0500 |
| commit | 09e4f9029da1b53e835555c353a89c36b71233b0 (patch) | |
| tree | 81d2a6de51b1bb3c704e5385dbc90ca79efa69bc /include/asm-ia64/sn/sn_feature_sets.h | |
| parent | 750b50ab5687125d8a1dc946d931b00acf016e2c (diff) | |
| parent | dbfedbb98145375106cee7ec7269611d553819dc (diff) | |
| download | talos-op-linux-09e4f9029da1b53e835555c353a89c36b71233b0.tar.gz talos-op-linux-09e4f9029da1b53e835555c353a89c36b71233b0.zip | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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 @@ */ -#include <asm/types.h> -#include <asm/bitops.h> - /* --------------------- PROM Features -----------------------------*/ extern int sn_prom_feature_available(int id); |
