lantiq: fix use of IRQF_DISABLED in lantiq kmods
[openwrt/staging/jogo.git] / package / kernel / lantiq / ltq-vmmc / patches / 200-compat.patch
1 --- a/src/drv_vmmc_linux.c
2 +++ b/src/drv_vmmc_linux.c
3 @@ -54,6 +54,8 @@
4 #include "drv_vmmc_res.h"
5 #endif /* (VMMC_CFG_FEATURES & VMMC_FEAT_HDLC) */
6
7 +#undef VMMC_USE_PROC
8 +
9 /* ============================= */
10 /* Local Macros & Definitions */
11 /* ============================= */
12 --- a/src/mps/drv_mps_vmmc_linux.c
13 +++ b/src/mps/drv_mps_vmmc_linux.c
14 @@ -80,11 +80,15 @@
15 /* ============================= */
16 #define IFX_MPS_DEV_NAME "ifx_mps"
17
18 +#undef CONFIG_MPS_HISTORY_SIZE
19 +#define CONFIG_MPS_HISTORY_SIZE 0
20 #ifndef CONFIG_MPS_HISTORY_SIZE
21 #define CONFIG_MPS_HISTORY_SIZE 128
22 #warning CONFIG_MPS_HISTORY_SIZE should have been set via cofigure - setting to default 128
23 #endif
24
25 +#undef CONFIG_PROC_FS
26 +
27 /* ============================= */
28 /* Global variable definition */
29 /* ============================= */
30 @@ -2257,7 +2261,7 @@ IFX_int32_t __init ifx_mps_init_module (
31 ifx_mps_reset ();
32 result = request_irq (INT_NUM_IM4_IRL18,
33 #ifdef LINUX_2_6
34 - ifx_mps_ad0_irq, IRQF_DISABLED
35 + ifx_mps_ad0_irq, 0x0
36 #else /* */
37 (irqreturn_t (*)(int, IFX_void_t *, struct pt_regs *))
38 ifx_mps_ad0_irq, SA_INTERRUPT
39 @@ -2267,7 +2271,7 @@ IFX_int32_t __init ifx_mps_init_module (
40 return result;
41 result = request_irq (INT_NUM_IM4_IRL19,
42 #ifdef LINUX_2_6
43 - ifx_mps_ad1_irq, IRQF_DISABLED
44 + ifx_mps_ad1_irq, 0x0
45 #else /* */
46 (irqreturn_t (*)(int, IFX_void_t *, struct pt_regs *))
47 ifx_mps_ad1_irq, SA_INTERRUPT
48 @@ -2282,7 +2286,7 @@ IFX_int32_t __init ifx_mps_init_module (
49 sprintf (&voice_channel_int_name[i][0], "mps_mbx vc%d", i);
50 result = request_irq (INT_NUM_IM4_IRL14 + i,
51 #ifdef LINUX_2_6
52 - ifx_mps_vc_irq, IRQF_DISABLED
53 + ifx_mps_vc_irq, 0x0
54 #else /* */
55 (irqreturn_t (*)
56 (int, IFX_void_t *,