webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-10 09:18:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into kernel-4.9

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2017-07-09 12:47:16 +02:00
parent 7c13ae02eb 82308f5387
commit b389d73110
906 changed files with 41258 additions and 116440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/patches/linux/linux-3.14.79-amba-fix.patch Normal file
View File

@@ -0,0 +1,11 @@
diff -Naur linux-3.14.79.ORG/include/linux/mod_devicetable.h linux-3.14.79/include/linux/mod_devicetable.h
--- linux-3.14.79.ORG/include/linux/mod_devicetable.h 2017-06-16 19:58:41.000000000 +0200
+++ linux-3.14.79/include/linux/mod_devicetable.h 2017-06-19 19:40:59.374205140 +0200
@@ -538,6 +538,7 @@
* == id.
* @data: Private data used by the driver.
*/
+#define amba_device_id amba_id
struct amba_id {
unsigned int id;
unsigned int mask;

12
src/patches/linux/linux-3.14.79-rpi-suspend-not-inline.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur linux-3.14.79.ORG/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.14.79/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
--- linux-3.14.79.ORG/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2017-06-16 19:58:56.000000000 +0200
+++ linux-3.14.79/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2017-06-17 09:32:51.645096482 +0200
@@ -1776,7 +1776,7 @@
** VC_RESUME_FAILED - Currently unused - no mechanism to fail resume exists.
*/
-inline void
+void
set_suspend_state(VCHIQ_ARM_STATE_T *arm_state,
enum vc_suspend_status new_state)
{