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

Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel-stable

Browse Source
This commit is contained in:
Russell King
2011-05-25 00:08:17 +01:00
parent d762f43831 ede338f4ce
commit 03eb14199e
17 changed files with 375 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/mips/include/asm/prom.h
View File

@@ -14,9 +14,6 @@
#ifdef CONFIG_OF
#include <asm/bootinfo.h>
/* which is compatible with the flattened device tree (FDT) */
#define cmd_line arcs_cmdline
extern int early_init_dt_scan_memory_arch(unsigned long node,
const char *uname, int depth, void *data);