Sophie

Sophie

distrib > * > 2008.0 > x86_64 > by-pkgid > 9f1122e3cc91315900f36ea9a01e5fff > files > 4

dkms-et131x-1.2.3-2.1mdv2008.0.src.rpm

Fix et131x_isr to match updated irq_handler_t.

See commit 7d12e780e003f93433d49ce78cfedf4b4c52adc5 that went in
Linux 2.6.19

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>

--- et131x-1.2.3.orig/et131x_isr.c	2008-01-19 23:26:54.000000000 -0200
+++ et131x-1.2.3/et131x_isr.c	2008-01-19 23:50:26.000000000 -0200
@@ -161,7 +161,6 @@ typedef void irqreturn_t;
    PARAMETERS        : irq    - the IRQ on which the interrupt was received.
                        dev_id - a buffer containing device-specific info (in
                                 this case, a pointer to a net_device struct)
-                       regs   - 
         
    RETURNS           : For 2.4.x kernels - N/A
                        For 2.6.x kernels - A value indicating if the interrupt
@@ -170,7 +169,7 @@ typedef void irqreturn_t;
    REUSE INFORMATION :
         
  *****************************************************************************/
-irqreturn_t et131x_isr( int irq, void *dev_id, struct pt_regs *regs )
+irqreturn_t et131x_isr( int irq, void *dev_id )
 {
     BOOL_t                 handled = TRUE;
     struct net_device     *netdev  = (struct net_device *)dev_id;
--- et131x-1.2.3.orig/et131x_isr.h	2008-01-19 23:26:54.000000000 -0200
+++ et131x-1.2.3/et131x_isr.h	2008-01-19 23:51:12.000000000 -0200
@@ -86,7 +86,7 @@
 #if ( LINUX_VERSION_CODE < KERNEL_VERSION( 2,6,0 ))
 void et131x_isr( int irq, void *dev_id, struct pt_regs *regs );
 #else
-irqreturn_t et131x_isr( int irq, void *dev_id, struct pt_regs *regs );
+irqreturn_t et131x_isr( int irq, void *dev_id );
 #endif
 
 void et131x_isr_handler( struct work_struct *work );