Merge ../linux-2.6

2005-11-08 11:14:20 +11:00
parent c613523455 3f00d3e8fb
commit 24bfb00123
1265 changed files with 41019 additions and 20203 deletions
@@ -70,6 +70,7 @@
 #include <asm/iseries/it_lp_queue.h>
 #include <asm/iseries/hv_call_xm.h>
 #endif
+#include <asm/smp.h>

 /* keep track of when we need to update the rtc */
 time_t last_rtc_update;