diff options
author | Russell King | 2011-05-25 01:08:17 +0200 |
---|---|---|
committer | Russell King | 2011-05-25 01:08:17 +0200 |
commit | 03eb14199e8a2ff2bc170b283305990151b0d619 (patch) | |
tree | c16c123a850e8033b2daa71ad9ae241906542dd8 /arch/mips/include | |
parent | Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let... (diff) | |
parent | dt: add documentation of ARM dt boot interface (diff) | |
download | kernel-qcow2-linux-03eb14199e8a2ff2bc170b283305990151b0d619.tar.gz kernel-qcow2-linux-03eb14199e8a2ff2bc170b283305990151b0d619.tar.xz kernel-qcow2-linux-03eb14199e8a2ff2bc170b283305990151b0d619.zip |
Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel-stable
Diffstat (limited to 'arch/mips/include')
-rw-r--r-- | arch/mips/include/asm/prom.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h index f29b862d9db3..857d9b7858ad 100644 --- a/arch/mips/include/asm/prom.h +++ b/arch/mips/include/asm/prom.h @@ -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); |