diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-03-26 14:28:31 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-03-26 14:28:31 +0000 |
| commit | 0d43b95e5e09d62071bec26e70b380fe619904f7 (patch) | |
| tree | d75a6a18b9350844fcedc74be84d1792278d0aec /package/ifxmips-dsl-api/patches/200-mei_compat.patch | |
| parent | 3b57cccb71a77546abfcae7cff911d4cf65cdda1 (diff) | |
| download | upstream-0d43b95e5e09d62071bec26e70b380fe619904f7.tar.gz upstream-0d43b95e5e09d62071bec26e70b380fe619904f7.tar.bz2 upstream-0d43b95e5e09d62071bec26e70b380fe619904f7.zip | |
package/ifxmips-dsl-api: refresh patches
SVN-Revision: 20463
Diffstat (limited to 'package/ifxmips-dsl-api/patches/200-mei_compat.patch')
| -rw-r--r-- | package/ifxmips-dsl-api/patches/200-mei_compat.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/package/ifxmips-dsl-api/patches/200-mei_compat.patch b/package/ifxmips-dsl-api/patches/200-mei_compat.patch index 58a1081ccc..352a974e60 100644 --- 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); |