Install the old usb headers under /usr/include/legacy/dev/usb as they are

needed by the hal port. This will be removed before 8.0.

Add an exclusion to kdump as some structs will be redefined.

Requested by:	marcus

etc/mtree/BSD.include.dist

@@ -195,6 +195,12 @@
     ..
     kadm5
     ..
+    legacy
+        dev
+            usb
+            ..
+        ..
+    ..
     libmilter
     ..
     lwres

include/Makefile

@@ -54,7 +54,7 @@ LSUBDIRS=	cam/scsi \
 	security/mac_mls security/mac_partition \
 	ufs/ffs ufs/ufs
 
-LSUBSUBDIRS=	dev/mpt/mpilib
+LSUBSUBDIRS=	dev/mpt/mpilib legacy/dev/usb
 
 .if ${MACHINE_ARCH} == "powerpc"
 _dev_powermac_nvram=	dev/powermac_nvram

usr.bin/kdump/mkioctls

@@ -18,11 +18,14 @@ fi
 
 LC_ALL=C; export LC_ALL
 
+# include subdirs to exclude from the search
+exclude="^legacy/.*"
+
 # Build a list of headers that have ioctls in them.
 # XXX should we use an ANSI cpp?
 ioctl_includes=`
 	cd $1
-	find -H -s * -name '*.h' |
+	find -H -s * -name '*.h' \! -regex $exclude |
 		xargs egrep -l \
 '^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO[^a-z0-9_]' |
 		awk '{printf("#include <%s>\\\\n", $1)}'