diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-05 18:33:19 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-05 18:33:19 -0400 |
| commit | 301fd5c13257862df66c81c48d963d474e63e0ef (patch) | |
| tree | 128af89336dd8b1ee62696c4588057b2eb0b445e /arch/blackfin/kernel/setup.c | |
| parent | daa56a06b5a592ceb69130a1d15c067a078f2701 (diff) | |
| parent | 7952717adb69efc1d2443a1858f96d23c2fb93e0 (diff) | |
Merge branch 'kzm9g' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
* 'kzm9g' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: kzm9g: enable restarting
+ sync to 3.6-rc3
Diffstat (limited to 'arch/blackfin/kernel/setup.c')
| -rw-r--r-- | arch/blackfin/kernel/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index ada8f0fc71e4..fb96e607adcf 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
| @@ -52,7 +52,6 @@ EXPORT_SYMBOL(reserved_mem_dcache_on); | |||
| 52 | #ifdef CONFIG_MTD_UCLINUX | 52 | #ifdef CONFIG_MTD_UCLINUX |
| 53 | extern struct map_info uclinux_ram_map; | 53 | extern struct map_info uclinux_ram_map; |
| 54 | unsigned long memory_mtd_end, memory_mtd_start, mtd_size; | 54 | unsigned long memory_mtd_end, memory_mtd_start, mtd_size; |
| 55 | unsigned long _ebss; | ||
| 56 | EXPORT_SYMBOL(memory_mtd_end); | 55 | EXPORT_SYMBOL(memory_mtd_end); |
| 57 | EXPORT_SYMBOL(memory_mtd_start); | 56 | EXPORT_SYMBOL(memory_mtd_start); |
| 58 | EXPORT_SYMBOL(mtd_size); | 57 | EXPORT_SYMBOL(mtd_size); |