Merge branch 'master' into kq_devices
authorSamuel J. Greear <sjg@thesjg.com>
Mon, 12 Jul 2010 03:38:36 +0000 (03:38 +0000)
committerSamuel J. Greear <sjg@thesjg.com>
Mon, 12 Jul 2010 03:38:36 +0000 (03:38 +0000)
1  2 
sys/dev/raid/vinum/vinum.c
sys/kern/kern_udev.c

@@@ -45,8 -45,7 +45,9 @@@
  #include "vinumhdr.h"
  #include <sys/sysproto.h>                                 /* for sync(2) */
  #include <sys/devicestat.h>
 +#include <sys/poll.h>                                     /* XXX: poll ops used in kq filters */
 +#include <sys/event.h>
+ #include <sys/udev.h>
  #ifdef VINUMDEBUG
  #include <sys/reboot.h>
  int debug = 0;
Simple merge