projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
misc
/
sgi-xp
/
xp.h
diff --git
a/drivers/misc/sgi-xp/xp.h
b/drivers/misc/sgi-xp/xp.h
index
851b2f2
..
c862cd4
100644
(file)
--- a/
drivers/misc/sgi-xp/xp.h
+++ b/
drivers/misc/sgi-xp/xp.h
@@
-25,7
+25,6
@@
#endif
#if defined CONFIG_IA64
-#include <asm/system.h>
#include <asm/sn/arch.h> /* defines is_shub1() and is_shub2() */
#define is_shub() ia64_platform_is("sn2")
#endif