From 9af0a3afc237d45aca0ff2101f26ef218ae03629 Mon Sep 17 00:00:00 2001 From: Yang Shi Date: Wed, 3 Mar 2010 16:43:20 +0800 Subject: [PATCH] --- yaml --- r: 189766 b: refs/heads/master c: 7ea4a6891b68fe60bf4eee41a7ef38d524b0aebd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/cavium-octeon/setup.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7f663c5ef342..d038ec6f3c5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a7ac952d5217b2f568e5ef91ac39b572e166f24 +refs/heads/master: 7ea4a6891b68fe60bf4eee41a7ef38d524b0aebd diff --git a/trunk/arch/mips/cavium-octeon/setup.c b/trunk/arch/mips/cavium-octeon/setup.c index e07c54048f97..9a06fa9f9f0c 100644 --- a/trunk/arch/mips/cavium-octeon/setup.c +++ b/trunk/arch/mips/cavium-octeon/setup.c @@ -45,9 +45,6 @@ extern struct plat_smp_ops octeon_smp_ops; extern void pci_console_init(const char *arg); #endif -#ifdef CONFIG_CAVIUM_RESERVE32 -extern uint64_t octeon_reserve32_memory; -#endif static unsigned long long MAX_MEMORY = 512ull << 20; struct octeon_boot_descriptor *octeon_boot_desc_ptr;