i get the following on a -current mac68k build:

cc  -O2 -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
-Wpointer-arith -Wno-uninitialized -Wno-main -msoft-float -I.
-I../../../../arch -I../../../.. -nostdinc -DHZ="0x3c" -DM68040 -DM68030
-DM68020 -DFPU_EMULATE -DLKM -DDIAGNOSTIC -DGRF_COMPAT -DMAXUSERS=16
-D_KERNEL -Dmac68k  -c ../../../../arch/mac68k/mac68k/trap.c
../../../../arch/mac68k/mac68k/trap.c: In function `trap':
../../../../arch/mac68k/mac68k/trap.c:507: conflicting types for
`softclock'
../../../../sys/systm.h:241: previous declaration of `softclock'
cc1: warnings being treated as errors
../../../../arch/mac68k/mac68k/trap.c:507: warning: extern declaration of
`softclock' doesn't match global one
../../../../arch/mac68k/mac68k/trap.c:510: too many arguments to function
`softclock'
*** Error code 1

Stop.


i know the changes were made by jason yesterday.  anyone have a fix yet,
or have i just screwed something up?

-colin