summaryrefslogtreecommitdiff
path: root/arch/m68k/bvme6000/config.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-04 13:54:56 (GMT)
committerIngo Molnar <mingo@elte.hu>2009-02-04 13:54:56 (GMT)
commitbb960a1e42042e82447a5bc0941b3ab6d614bac3 (patch)
treed2295a923fabb1b01b25bb015c4c2e42ee9df5ca /arch/m68k/bvme6000/config.c
parent858770619debfb9269add63e4ba8b7c6b5538dd1 (diff)
parent06fc732c33a7ff5e4c91bcf4a6ca86b5e335ad9a (diff)
downloadlinux-fsl-qoriq-bb960a1e42042e82447a5bc0941b3ab6d614bac3.tar.xz
Merge branch 'core/xen' into x86/urgent
Diffstat (limited to 'arch/m68k/bvme6000/config.c')
-rw-r--r--arch/m68k/bvme6000/config.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index c072595..9fe6fef 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -43,7 +43,6 @@ extern unsigned long bvme6000_gettimeoffset (void);
extern int bvme6000_hwclk (int, struct rtc_time *);
extern int bvme6000_set_clock_mmss (unsigned long);
extern void bvme6000_reset (void);
-extern void bvme6000_waitbut(void);
void bvme6000_set_vectors (void);
/* Save tick handler routine pointer, will point to do_timer() in