Merge bk://are.twiddle.net/axp-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

arch/alpha/Kconfig

@@ -269,17 +269,6 @@ config ISA
 	  (MCA) or VESA.  ISA is an older system, now being displaced by PCI;
 	  newer boards don't support it.  If you have ISA, say Y, otherwise N.
 
-config SBUS
-	bool
-
-config MCA
-	bool
-	help
-	  MicroChannel Architecture is found in some IBM PS/2 machines and
-	  laptops.  It is a bus system similar to PCI or ISA. See
-	  <file:Documentation/mca.txt> (and especially the web page given
-	  there) before attempting to build an MCA bus kernel.
-
 config PCI
 	bool
 	depends on !ALPHA_JENSEN

arch/alpha/kernel/systbls.S

@@ -443,6 +443,7 @@ sys_call_table:
 	.quad sys_clock_getres
 	.quad sys_clock_nanosleep
 	.quad sys_semtimedop
+	.quad sys_tgkill
 
 	.size sys_call_table, . - sys_call_table
 	.type sys_call_table, @object

include/asm-alpha/timex.h

@@ -6,7 +6,9 @@
 #ifndef _ASMALPHA_TIMEX_H
 #define _ASMALPHA_TIMEX_H
 
-#define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
+/* With only one or two oddballs, we use the RTC as the ticker, selecting
+   the 32.768kHz reference clock, which nicely divides down to our HZ.  */
+#define CLOCK_TICK_RATE	32768
 
 /*
  * Standard way to access the cycle counter.

include/asm-alpha/unistd.h

@@ -359,7 +359,8 @@
 #define __NR_clock_getres		421
 #define __NR_clock_nanosleep		422
 #define __NR_semtimedop			423
-#define NR_SYSCALLS			424
+#define __NR_tgkill			424
+#define NR_SYSCALLS			425
 
 #if defined(__GNUC__)