Merge branch 'linus' into x86/irq

[linux-2.6-omap-h63xx.git] / arch / um / include / irq_user.h

diff --git a/arch/um/include/irq_user.h b/arch/um/include/irq_user.h
index e16ebce1290d6adb47971af31971de3556d32fea..e60b31873de135ebd949723ca2cdc283deab31d3 100644 (file)
--- a/arch/um/include/irq_user.h
+++ b/arch/um/include/irq_user.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
 #ifndef __IRQ_USER_H__
 #define __IRQ_USER_H__
 
-#include "uml-config.h"
+#include "sysdep/ptrace.h"
 
 struct irq_fd {
        struct irq_fd *next;
@@ -14,7 +14,6 @@ struct irq_fd {
        int fd;
        int type;
        int irq;
-       int pid;
        int events;
        int current_events;
 };