Merge commit 'v2.6.27-rc8' into x86/setup

[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 884a9c17eea08b55c87086958b5991a1b8b2f2e6..c6c784df2673a93e7ad0d794a9e1ff38824c0791 100644 (file)
--- a/arch/um/include/irq_user.h
+++ b/arch/um/include/irq_user.h
@@ -14,7 +14,6 @@ struct irq_fd {
        int fd;
        int type;
        int irq;
-       int pid;
        int events;
        int current_events;
 };
@@ -22,8 +21,6 @@ struct irq_fd {
 enum { IRQ_READ, IRQ_WRITE };
 
 extern void sigio_handler(int sig, struct uml_pt_regs *regs);
-extern int activate_fd(int irq, int fd, int type, void *dev_id);
-extern void free_irq_by_irq_and_dev(unsigned int irq, void *dev_id);
 extern void free_irq_by_fd(int fd);
 extern void reactivate_fd(int fd, int irqnum);
 extern void deactivate_fd(int fd, int irqnum);