diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:45:09 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:45:09 -0500 |
| commit | ab639f3593f0b5e4439d549831442c18c3baf989 (patch) | |
| tree | 118743e94e5dc86c835dbc1f1d3bf1612f4ae740 /drivers/misc/sgi-gru/gru.h | |
| parent | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (diff) | |
| parent | 58105ef1857112a186696c9b8957020090226a28 (diff) | |
Merge branch 'core/percpu' into x86/core
Diffstat (limited to 'drivers/misc/sgi-gru/gru.h')
| -rw-r--r-- | drivers/misc/sgi-gru/gru.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/misc/sgi-gru/gru.h b/drivers/misc/sgi-gru/gru.h index 1b5f579df15..f93f03a9e6e 100644 --- a/drivers/misc/sgi-gru/gru.h +++ b/drivers/misc/sgi-gru/gru.h | |||
| @@ -19,8 +19,6 @@ | |||
| 19 | #ifndef __GRU_H__ | 19 | #ifndef __GRU_H__ |
| 20 | #define __GRU_H__ | 20 | #define __GRU_H__ |
| 21 | 21 | ||
| 22 | #include <asm/uv/uv.h> | ||
| 23 | |||
| 24 | /* | 22 | /* |
| 25 | * GRU architectural definitions | 23 | * GRU architectural definitions |
| 26 | */ | 24 | */ |