sync

3 files changed, 110 insertions, 108 deletions

diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index d0350750c4d..e8dc04266c9 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -5,61 +5,62 @@
 ./usr/include/bfdlink.h
 ./usr/include/dlfcn.h
 ./usr/include/link.h
-./usr/include/machine/ansi.h
-./usr/include/machine/apmvar.h
-./usr/include/machine/asm.h
-./usr/include/machine/biosvar.h
-./usr/include/machine/bus.h
-./usr/include/machine/cdefs.h
-./usr/include/machine/conf.h
-./usr/include/machine/cpu.h
-./usr/include/machine/cpufunc.h
-./usr/include/machine/cputypes.h
-./usr/include/machine/db_machdep.h
-./usr/include/machine/disklabel.h
-./usr/include/machine/endian.h
-./usr/include/machine/exec.h
-./usr/include/machine/float.h
-./usr/include/machine/frame.h
-./usr/include/machine/freebsd_machdep.h
-./usr/include/machine/gdt.h
-./usr/include/machine/ieeefp.h
-./usr/include/machine/intr.h
-./usr/include/machine/ioctl_bt848.h
-./usr/include/machine/ioctl_fd.h
-./usr/include/machine/ioctl_meteor.h
-./usr/include/machine/joystick.h
-./usr/include/machine/limits.h
-./usr/include/machine/linux_machdep.h
-./usr/include/machine/mouse.h
-./usr/include/machine/npx.h
-./usr/include/machine/param.h
-./usr/include/machine/pcb.h
-./usr/include/machine/pccons.h
-./usr/include/machine/pctr.h
-./usr/include/machine/pcvt_ioctl.h
-./usr/include/machine/pio.h
-./usr/include/machine/pmap.h
-./usr/include/machine/proc.h
-./usr/include/machine/profile.h
-./usr/include/machine/psl.h
-./usr/include/machine/pte.h
-./usr/include/machine/ptrace.h
-./usr/include/machine/reg.h
-./usr/include/machine/segments.h
-./usr/include/machine/setjmp.h
-./usr/include/machine/signal.h
-./usr/include/machine/specialreg.h
-./usr/include/machine/spkr.h
-./usr/include/machine/stdarg.h
-./usr/include/machine/svr4_machdep.h
-./usr/include/machine/sysarch.h
-./usr/include/machine/trap.h
-./usr/include/machine/tss.h
-./usr/include/machine/types.h
-./usr/include/machine/varargs.h
-./usr/include/machine/vm86.h
-./usr/include/machine/vmparam.h
+./usr/include/i386/ansi.h
+./usr/include/i386/apmvar.h
+./usr/include/i386/asm.h
+./usr/include/i386/biosvar.h
+./usr/include/i386/bus.h
+./usr/include/i386/cdefs.h
+./usr/include/i386/conf.h
+./usr/include/i386/cpu.h
+./usr/include/i386/cpufunc.h
+./usr/include/i386/cputypes.h
+./usr/include/i386/db_machdep.h
+./usr/include/i386/disklabel.h
+./usr/include/i386/endian.h
+./usr/include/i386/exec.h
+./usr/include/i386/float.h
+./usr/include/i386/frame.h
+./usr/include/i386/freebsd_machdep.h
+./usr/include/i386/gdt.h
+./usr/include/i386/ieeefp.h
+./usr/include/i386/intr.h
+./usr/include/i386/ioctl_bt848.h
+./usr/include/i386/ioctl_fd.h
+./usr/include/i386/ioctl_meteor.h
+./usr/include/i386/joystick.h
+./usr/include/i386/limits.h
+./usr/include/i386/linux_machdep.h
+./usr/include/i386/mouse.h
+./usr/include/i386/npx.h
+./usr/include/i386/param.h
+./usr/include/i386/pcb.h
+./usr/include/i386/pccons.h
+./usr/include/i386/pctr.h
+./usr/include/i386/pcvt_ioctl.h
+./usr/include/i386/pio.h
+./usr/include/i386/pmap.h
+./usr/include/i386/proc.h
+./usr/include/i386/profile.h
+./usr/include/i386/psl.h
+./usr/include/i386/pte.h
+./usr/include/i386/ptrace.h
+./usr/include/i386/reg.h
+./usr/include/i386/segments.h
+./usr/include/i386/setjmp.h
+./usr/include/i386/signal.h
+./usr/include/i386/spinlock.h
+./usr/include/i386/specialreg.h
+./usr/include/i386/spkr.h
+./usr/include/i386/stdarg.h
+./usr/include/i386/svr4_machdep.h
+./usr/include/i386/sysarch.h
+./usr/include/i386/trap.h
+./usr/include/i386/tss.h
+./usr/include/i386/types.h
+./usr/include/i386/varargs.h
+./usr/include/i386/vm86.h
+./usr/include/i386/vmparam.h
 ./usr/include/obstack.h
 ./usr/include/readline
 ./usr/include/readline/chardefs.h
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index c4bb86c4c70..35df34e17c2 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -4,58 +4,59 @@
 ./usr/include/bfdlink.h
 ./usr/include/dlfcn.h
 ./usr/include/link.h
-./usr/include/machine/ansi.h
-./usr/include/machine/asm.h
-./usr/include/machine/autoconf.h
-./usr/include/machine/bsd_audioio.h
-./usr/include/machine/bsd_openprom.h
-./usr/include/machine/cdefs.h
-./usr/include/machine/cgtworeg.h
-./usr/include/machine/conf.h
-./usr/include/machine/cpu.h
-./usr/include/machine/ctlreg.h
-./usr/include/machine/db_machdep.h
-./usr/include/machine/disklabel.h
-./usr/include/machine/eeprom.h
-./usr/include/machine/endian.h
-./usr/include/machine/exec.h
-./usr/include/machine/fbio.h
-./usr/include/machine/fbvar.h
-./usr/include/machine/float.h
-./usr/include/machine/frame.h
-./usr/include/machine/fsr.h
-./usr/include/machine/idprom.h
-./usr/include/machine/ieee.h
-./usr/include/machine/ieeefp.h
-./usr/include/machine/instr.h
-./usr/include/machine/ioctl_fd.h
-./usr/include/machine/kbd.h
-./usr/include/machine/kbio.h
-./usr/include/machine/kcore.h
-./usr/include/machine/limits.h
-./usr/include/machine/oldmon.h
-./usr/include/machine/openpromio.h
-./usr/include/machine/param.h
-./usr/include/machine/pcb.h
-./usr/include/machine/pmap.h
-./usr/include/machine/proc.h
-./usr/include/machine/profile.h
-./usr/include/machine/psl.h
-./usr/include/machine/pte.h
-./usr/include/machine/ptrace.h
-./usr/include/machine/reg.h
-./usr/include/machine/reloc.h
-./usr/include/machine/remote-sl.h
-./usr/include/machine/setjmp.h
-./usr/include/machine/signal.h
-./usr/include/machine/stdarg.h
-./usr/include/machine/sun_disklabel.h
-./usr/include/machine/svr4_machdep.h
-./usr/include/machine/trap.h
-./usr/include/machine/types.h
-./usr/include/machine/varargs.h
-./usr/include/machine/vmparam.h
-./usr/include/machine/vuid_event.h
+./usr/include/sparc/ansi.h
+./usr/include/sparc/asm.h
+./usr/include/sparc/autoconf.h
+./usr/include/sparc/bsd_audioio.h
+./usr/include/sparc/bsd_openprom.h
+./usr/include/sparc/cdefs.h
+./usr/include/sparc/cgtworeg.h
+./usr/include/sparc/conf.h
+./usr/include/sparc/cpu.h
+./usr/include/sparc/ctlreg.h
+./usr/include/sparc/db_machdep.h
+./usr/include/sparc/disklabel.h
+./usr/include/sparc/eeprom.h
+./usr/include/sparc/endian.h
+./usr/include/sparc/exec.h
+./usr/include/sparc/fbio.h
+./usr/include/sparc/fbvar.h
+./usr/include/sparc/float.h
+./usr/include/sparc/frame.h
+./usr/include/sparc/fsr.h
+./usr/include/sparc/idprom.h
+./usr/include/sparc/ieee.h
+./usr/include/sparc/ieeefp.h
+./usr/include/sparc/instr.h
+./usr/include/sparc/ioctl_fd.h
+./usr/include/sparc/kbd.h
+./usr/include/sparc/kbio.h
+./usr/include/sparc/kcore.h
+./usr/include/sparc/limits.h
+./usr/include/sparc/oldmon.h
+./usr/include/sparc/openpromio.h
+./usr/include/sparc/param.h
+./usr/include/sparc/pcb.h
+./usr/include/sparc/pmap.h
+./usr/include/sparc/proc.h
+./usr/include/sparc/profile.h
+./usr/include/sparc/psl.h
+./usr/include/sparc/pte.h
+./usr/include/sparc/ptrace.h
+./usr/include/sparc/reg.h
+./usr/include/sparc/reloc.h
+./usr/include/sparc/remote-sl.h
+./usr/include/sparc/setjmp.h
+./usr/include/sparc/signal.h
+./usr/include/sparc/stdarg.h
+./usr/include/sparc/sun_disklabel.h
+./usr/include/sparc/svr4_machdep.h
+./usr/include/sparc/trap.h
+./usr/include/sparc/types.h
+./usr/include/sparc/varargs.h
+./usr/include/sparc/vmparam.h
+./usr/include/sparc/spinlock.h
+./usr/include/sparc/vuid_event.h
 ./usr/include/obstack.h
 ./usr/include/readline/chardefs.h
 ./usr/include/readline/keymaps.h
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 8cf6f3398bc..1d7f0a41d29 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -245,6 +245,7 @@
 ./usr/include/dev/pci/vga_pcivar.h
 ./usr/include/dev/pci/vgafb_pcivar.h
 ./usr/include/dev/pcmcia
+./usr/include/dev/pcmcia/if_xereg.h
 ./usr/include/dev/pcmcia/pcmciachip.h
 ./usr/include/dev/pcmcia/pcmciadevs.h
 ./usr/include/dev/pcmcia/pcmciareg.h
@@ -719,7 +720,6 @@
 ./usr/include/libgen.h
 ./usr/include/limits.h
 ./usr/include/locale.h
-./usr/include/machine/spinlock.h
 ./usr/include/malloc.h
 ./usr/include/math.h
 ./usr/include/md4.h