diff options
| author | John Crispin <john@openwrt.org> | 2015-10-11 16:24:43 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-10-11 16:24:43 +0000 |
| commit | f457ae99f20bed2f8482ca9f9f1e4e7ac2701d40 (patch) | |
| tree | 0b25a270ff72425410f784e6849738622c6988b4 /package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch | |
| parent | c9ef7a49c7b9425556b1b88761c096741bca20aa (diff) | |
| download | upstream-f457ae99f20bed2f8482ca9f9f1e4e7ac2701d40.tar.gz upstream-f457ae99f20bed2f8482ca9f9f1e4e7ac2701d40.tar.bz2 upstream-f457ae99f20bed2f8482ca9f9f1e4e7ac2701d40.zip | |
lantiq: fix use of IRQF_DISABLED in lantiq kmods
The IRQF_DISABLED flag was removed in kernel 4.1 with commit
"genirq: Remove the deprecated 'IRQF_DISABLED' request_irq() flag entirely" [1].
Therefore the compilation of ltq-hcd and ltq-vmmc kmods fails.
[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=d8bf368d0631d4bc2612d8bf2e4e8e74e620d0cc
Signed-off-by: Mathias Kresin <openwrt@kresin.me>
SVN-Revision: 47180
Diffstat (limited to 'package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch')
| -rw-r--r-- | package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch b/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch index 490d6e5dc9..d2afc65dcd 100644 --- a/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch +++ b/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch @@ -154,7 +154,7 @@ #define IFX_MPS_PLATFORM_NAME "MIPS24KEc" --- a/src/mps/drv_mps_vmmc_linux.c +++ b/src/mps/drv_mps_vmmc_linux.c -@@ -2225,7 +2225,7 @@ IFX_int32_t __init ifx_mps_init_module ( +@@ -2229,7 +2229,7 @@ IFX_int32_t __init ifx_mps_init_module ( #if defined(CONFIG_MIPS) && !defined(CONFIG_MIPS_UNCACHED) #if defined(SYSTEM_DANUBE) bDoCacheOps = IFX_TRUE; /* on Danube always perform cache ops */ @@ -163,7 +163,7 @@ /* on AR9/VR9 cache is configured by BSP; here we check whether the D-cache is shared or partitioned; 1) in case of shared D-cache all cache operations are omitted; -@@ -2255,7 +2255,8 @@ IFX_int32_t __init ifx_mps_init_module ( +@@ -2259,7 +2259,8 @@ IFX_int32_t __init ifx_mps_init_module ( /* reset the device before initializing the device driver */ ifx_mps_reset (); @@ -171,9 +171,9 @@ + + result = request_irq (INT_NUM_IM4_IRL18, #ifdef LINUX_2_6 - ifx_mps_ad0_irq, IRQF_DISABLED + ifx_mps_ad0_irq, 0x0 #else /* */ -@@ -2396,7 +2397,7 @@ IFX_int32_t __init ifx_mps_init_module ( +@@ -2400,7 +2401,7 @@ IFX_int32_t __init ifx_mps_init_module ( if (result = ifx_mps_init_gpt_danube ()) return result; #endif /*DANUBE*/ @@ -718,7 +718,7 @@ pMPSDev->event.MPS_Ad1Reg.val = MPS_Ad1StatusReg.val; /* use callback function or queue wake up to notify about data reception */ -@@ -2977,11 +2990,13 @@ irqreturn_t ifx_mps_vc_irq (IFX_int32_t +@@ -2977,11 +2990,13 @@ irqreturn_t ifx_mps_vc_irq (IFX_int32_t IFX_MPS_CVC0SR[chan] = MPS_VCStatusReg.val; /* handle only enabled interrupts */ MPS_VCStatusReg.val &= IFX_MPS_VC0ENR[chan]; |