From: John Crispin Date: Fri, 1 Jan 2016 21:21:04 +0000 (+0000) Subject: lantiq: ltq-vmmc: Fix compilation with linux 4.4 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e0019b33a4e198ab7b00b103d19d33988fdab4f6;p=openwrt%2Fstaging%2Fneocturne.git lantiq: ltq-vmmc: Fix compilation with linux 4.4 gpio.h needs the linux/ prefix with linux 4.4. SVN-Revision: 48057 --- diff --git a/package/kernel/lantiq/ltq-vmmc/patches/100-target.patch b/package/kernel/lantiq/ltq-vmmc/patches/100-target.patch index cabd2d199c..974ed831de 100644 --- a/package/kernel/lantiq/ltq-vmmc/patches/100-target.patch +++ b/package/kernel/lantiq/ltq-vmmc/patches/100-target.patch @@ -143,7 +143,7 @@ -#include +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)) +# include -+# include ++# include +# include + +# define ifx_gptu_timer_request lq_request_timer @@ -432,7 +432,7 @@ -#include +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)) +# include -+# include ++# include +# include +# include + @@ -513,9 +513,9 @@ -#include +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)) +# include -+# include ++# include +# include -+# include ++# include +#define IFXMIPS_MPS_SRAM ((u32 *)(KSEG1 + 0x1F200000)) +#define IFXMIPS_MPS_BASE_ADDR (KSEG1 + 0x1F107000) +#define IFXMIPS_MPS_CHIPID ((u32 *)(IFXMIPS_MPS_BASE_ADDR + 0x0344)) diff --git a/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch b/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch index d2afc65dcd..7ebf171ad2 100644 --- a/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch +++ b/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch @@ -783,7 +783,7 @@ +++ b/src/mps/drv_mps_vmmc_device.h @@ -22,7 +22,12 @@ # include - # include + # include #define IFXMIPS_MPS_SRAM ((u32 *)(KSEG1 + 0x1F200000)) +#if defined(SYSTEM_FALCON) +#define IFXMIPS_MPS_BASE_ADDR (KSEG1 + 0x1D004000)