Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / drivers / net / irda / irport.h

diff --git a/drivers/net/irda/irport.h b/drivers/net/irda/irport.h
index 991f956..3f46b84 100644 (file)
--- a/drivers/net/irda/irport.h
+++ b/drivers/net/irda/irport.h
@@ -74,17 +74,7 @@ struct irport_cb {
        /* For piggyback drivers */
        void *priv;                
        void (*change_speed)(void *priv, __u32 speed);
-       int (*interrupt)(int irq, void *dev_id, struct pt_regs *regs);
+       irqreturn_t (*interrupt)(int irq, void *dev_id);
 };
 
-struct irport_cb *irport_open(int i, unsigned int iobase, unsigned int irq);
-int  irport_close(struct irport_cb *self);
-void irport_start(struct irport_cb *self);
-void irport_stop(struct irport_cb *self);
-void irport_change_speed(void *priv, __u32 speed);
-irqreturn_t irport_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-int  irport_hard_xmit(struct sk_buff *skb, struct net_device *dev);
-int  irport_net_open(struct net_device *dev);
-int  irport_net_close(struct net_device *dev);
-
 #endif /* IRPORT_H */