summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-07-30 12:32:45 +0000
committerWolfgang Denk <wd@denx.de>2011-08-01 15:10:15 +0200
commitf6c019c45440c61734a6ea02d27895820fbba31e (patch)
treec7a8f096af7c8b1548b3e7c00f8a1010b5c7db44 /arch/x86
parent5589073a16f8927591785a5a9e84edc292476fc1 (diff)
downloadblackbird-obmc-uboot-f6c019c45440c61734a6ea02d27895820fbba31e.tar.gz
blackbird-obmc-uboot-f6c019c45440c61734a6ea02d27895820fbba31e.zip
Unify timer_init() and cpu_init() prototypes
Clean up some duplicated prototype declarations. Get rid of now useless AVR32 initcalls.h file. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert Aribaud <albert.aribaud@free.fr> Cc: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Cc: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/u-boot-x86.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h
index 944e1a2005..4f0d2c7e7e 100644
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -36,7 +36,6 @@ typedef void (timer_fnc_t) (void);
int register_timer_isr (timer_fnc_t *isr_func);
/* Architecture specific - can be in arch/x86/cpu/, arch/x86/lib/, or $(BOARD)/ */
-int timer_init(void);
int dram_init_f(void);
/* cpu/.../interrupts.c */
OpenPOWER on IntegriCloud