[backfire] merge r27449

[openwrt-10.03/.git] / package / ifxmips-dsl-api / patches / 200-mei_compat.patch

diff --git a/package/ifxmips-dsl-api/patches/200-mei_compat.patch b/package/ifxmips-dsl-api/patches/200-mei_compat.patch
index 58a1081ccca86ba3511c3e3596720384c5b2ac3b..352a974e60cfe6ef3be3925739007c55a2803ee4 100644 (file)
--- a/package/ifxmips-dsl-api/patches/200-mei_compat.patch
+++ b/package/ifxmips-dsl-api/patches/200-mei_compat.patch
@@ -1,7 +1,5 @@
-Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
-===================================================================
---- drv_dsl_cpe_api-3.24.4.4.orig/src/mei/ifxmips_mei.c        2009-10-31 23:30:20.000000000 +0100
-+++ drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c     2010-01-24 14:21:32.000000000 +0100
+--- a/src/mei/ifxmips_mei.c
++++ b/src/mei/ifxmips_mei.c
 @@ -41,18 +41,20 @@
  #include <linux/init.h>
  #include <linux/ioport.h>
@@ -39,7 +37,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
  #define IFX_MEI_EMSG(fmt, args...) printk(KERN_ERR  "[%s %d]: " fmt,__FUNCTION__, __LINE__, ## args)
  #define IFX_MEI_DMSG(fmt, args...) printk(KERN_INFO "[%s %d]: " fmt,__FUNCTION__, __LINE__, ## args)
  
-@@ -173,7 +175,8 @@
+@@ -173,7 +175,8 @@ static u32 *mei_arc_swap_buff = NULL;      //
  extern void ifxmips_mask_and_ack_irq(unsigned int irq_nr);
  #define MEI_MASK_AND_ACK_IRQ ifxmips_mask_and_ack_irq
  
@@ -49,7 +47,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
  
  static struct file_operations bsp_mei_operations = {
        owner:THIS_MODULE,
-@@ -2294,10 +2297,10 @@
+@@ -2294,10 +2297,10 @@ IFX_MEI_InitDevice (int num)
                IFX_MEI_EMSG ("request_irq %d failed!\n", pDev->nIrq[IFX_DFEIR]);
                return -1;
        }
@@ -62,7 +60,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
  //    IFX_MEI_DMSG("Device %d initialized. IER %#x\n", num, bsp_get_irq_ier(pDev->nIrq[IFX_DYING_GASP]));
        return 0;
  }
-@@ -2922,6 +2925,7 @@
+@@ -2922,6 +2925,7 @@ int __init
  IFX_MEI_ModuleInit (void)
  {
        int i = 0;
@@ -70,7 +68,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
  
        printk ("IFX MEI Version %ld.%02ld.%02ld", bsp_mei_version.major, bsp_mei_version.minor, bsp_mei_version.revision);
  
-@@ -2935,14 +2939,15 @@
+@@ -2935,14 +2939,15 @@ IFX_MEI_ModuleInit (void)
                IFX_MEI_InitProcFS (i);
  #endif
        }
@@ -88,7 +86,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
        return 0;
  }
  
-@@ -2996,3 +3001,5 @@
+@@ -2996,3 +3001,5 @@ EXPORT_SYMBOL (DSL_BSP_EventCBUnregister
  
  module_init (IFX_MEI_ModuleInit);
  module_exit (IFX_MEI_ModuleExit);