xserver: Branch 'master'

[Ben Byer]

 hw/darwin/utils/dumpkeymap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 28e48cd8e6e4c412a49d7177daad6d3c93c28e08 (from b6c0697fd67323893a9ad3676c33f2f1ec48e15e)
Author: Ben Byer <bbyer at bbyer.local>
Date:   Wed Sep 5 04:43:17 2007 -0700

    Another pathname fix for event_status_driver.h

diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c
index d2eeca5..0c8bdcd 100644
--- a/hw/darwin/utils/dumpkeymap.c
+++ b/hw/darwin/utils/dumpkeymap.c
@@ -143,7 +143,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #if !defined(DUMPKEYMAP_FILE_ONLY)
-#include <drivers/event_status_driver.h>
+#include <IOKit/hidsystem/event_status_driver.h>
 #endif
 
 #define PROG_NAME "dumpkeymap"