From 960d036725035f55297512df5c56fccfed973b5f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 10 Oct 2008 18:57:21 +0800 Subject: [PATCH] --- yaml --- r: 113783 b: refs/heads/master c: 9a6f5ae1f1f3c37aad938a1c82db248a3f95a629 h: refs/heads/master i: 113781: deb0d486da4870e78f1ff36305f57c2cdef4964e 113779: 75eee71a4b0dad9a6672a5c7f3f983c1a1089835 113775: fe866619a63910fc6d2b00896b96f8105ac9f7c4 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/bfin-global.h | 1 - trunk/arch/blackfin/kernel/reboot.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 95c84e8339ac..a8318fa9ff3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e482cad241c0b7108cbc94959307a73d19ba17d5 +refs/heads/master: 9a6f5ae1f1f3c37aad938a1c82db248a3f95a629 diff --git a/trunk/arch/blackfin/include/asm/bfin-global.h b/trunk/arch/blackfin/include/asm/bfin-global.h index f842ea3bfc19..56dcb0a2d244 100644 --- a/trunk/arch/blackfin/include/asm/bfin-global.h +++ b/trunk/arch/blackfin/include/asm/bfin-global.h @@ -63,7 +63,6 @@ extern void bfin_dcache_init(void); extern void init_exception_vectors(void); extern void program_IAR(void); -extern void bfin_reset(void); extern asmlinkage void lower_to_irq14(void); extern asmlinkage void bfin_return_from_exception(void); extern asmlinkage void evt14_softirq(void); diff --git a/trunk/arch/blackfin/kernel/reboot.c b/trunk/arch/blackfin/kernel/reboot.c index b0a8f89cc9b6..d0ead640d992 100644 --- a/trunk/arch/blackfin/kernel/reboot.c +++ b/trunk/arch/blackfin/kernel/reboot.c @@ -20,7 +20,7 @@ * the core reset. */ __attribute__((l1_text)) -void bfin_reset(void) +static void bfin_reset(void) { /* Wait for completion of "system" events such as cache line * line fills so that we avoid infinite stalls later on as