diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 00:08:17 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 00:08:17 +0100 |
| commit | 03eb14199e8a2ff2bc170b283305990151b0d619 (patch) | |
| tree | c16c123a850e8033b2daa71ad9ae241906542dd8 /arch/arm/include/asm/setup.h | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
| parent | ede338f4ce2fb5ee99d18751df32fbd3b10df268 (diff) | |
| download | linux-03eb14199e8a2ff2bc170b283305990151b0d619.tar.gz linux-03eb14199e8a2ff2bc170b283305990151b0d619.tar.bz2 linux-03eb14199e8a2ff2bc170b283305990151b0d619.zip | |
Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/include/asm/setup.h')
| -rw-r--r-- | arch/arm/include/asm/setup.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h index 95176af3df8c..ee2ad8ae07af 100644 --- a/arch/arm/include/asm/setup.h +++ b/arch/arm/include/asm/setup.h @@ -217,6 +217,10 @@ extern struct meminfo meminfo; #define bank_phys_end(bank) ((bank)->start + (bank)->size) #define bank_phys_size(bank) (bank)->size +extern int arm_add_memory(phys_addr_t start, unsigned long size); +extern void early_print(const char *str, ...); +extern void dump_machine_table(void); + #endif /* __KERNEL__ */ #endif |