TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into for-next

Browse Source 
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
This commit is contained in:
Jiri Kosina
2011-04-26 10:22:15 +02:00
parent 9d5e6bdb30 cd2e49e90f
commit 07f9479a40
6039 changed files with 191812 additions and 82206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/fw/arc/Makefile
View File

@@ -9,4 +9,4 @@ lib-$(CONFIG_ARC_MEMORY) += memory.o
lib-$(CONFIG_ARC_CONSOLE) += arc_con.o
lib-$(CONFIG_ARC_PROMLIB) += promlib.o
EXTRA_CFLAGS += -Werror
ccflags-y := -Werror

2
arch/mips/fw/arc/promlib.c
View File

@@ -4,7 +4,7 @@
* for more details.
*
* Copyright (C) 1996 David S. Miller (dm@sgi.com)
* Compability with board caches, Ulf Carlsson
* Compatibility with board caches, Ulf Carlsson
*/
#include <linux/kernel.h>
#include <asm/sgialib.h>