summaryrefslogtreecommitdiffstats
path: root/board/xilinx
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-04-24 21:13:31 +0200
committerWolfgang Denk <wd@denx.de>2010-04-24 21:13:31 +0200
commit500fbae2043532275e09a8666d837d052c9bad9a (patch)
treef793ba7c048230cf2d9f888faa4df7dc038fd679 /board/xilinx
parentb919a3f2981109c9f2aaafe9c692dbb99f1c6366 (diff)
parent8ff972c6e99938f1a033e5500dccc9a37ce3406f (diff)
downloadblackbird-obmc-uboot-500fbae2043532275e09a8666d837d052c9bad9a.tar.gz
blackbird-obmc-uboot-500fbae2043532275e09a8666d837d052c9bad9a.zip
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
Diffstat (limited to 'board/xilinx')
-rw-r--r--board/xilinx/microblaze-generic/microblaze-generic.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index f388b775c2..838f1315b3 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -60,10 +60,9 @@ void fsl_isr2 (void *arg) {
puts("*");
}
-void fsl_init2 (void) {
+int fsl_init2 (void) {
puts("fsl_init2\n");
- install_interrupt_handler (FSL_INTR_2,\
- fsl_isr2,\
- NULL);
+ install_interrupt_handler (FSL_INTR_2, fsl_isr2, NULL);
+ return 0;
}
#endif
OpenPOWER on IntegriCloud