From 198ea9e294e38cea49f9f2d9b911bdfdd20e48dc Mon Sep 17 00:00:00 2001 From: wdenk Date: Thu, 12 Feb 2004 15:11:57 +0000 Subject: [PATCH] Last minute fixes / cleanup. --- board/evb64260/pci.c | 8 ++++---- board/omap1610inn/flash.c | 5 +++-- rtc/ds1306.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/board/evb64260/pci.c b/board/evb64260/pci.c index e3172b210e..9cd9722eec 100644 --- a/board/evb64260/pci.c +++ b/board/evb64260/pci.c @@ -9,11 +9,11 @@ static const unsigned char pci_irq_swizzle[2][PCI_MAX_DEVICES] = { #ifdef CONFIG_ZUMA_V2 - {0, 0, 0, 0, 0, 0, 0, 29,[8...PCI_MAX_DEVICES - 1] = 0}, - {0, 0, 0, 0, 0, 0, 0, 28,[8...PCI_MAX_DEVICES - 1] = 0} + {0, 0, 0, 0, 0, 0, 0, 29,[8 ... PCI_MAX_DEVICES - 1] = 0}, + {0, 0, 0, 0, 0, 0, 0, 28,[8 ... PCI_MAX_DEVICES - 1] = 0} #else /* EVB??? This is a guess */ - {0, 0, 0, 0, 0, 0, 0, 27, 27,[9...PCI_MAX_DEVICES - 1] = 0}, - {0, 0, 0, 0, 0, 0, 0, 29, 29,[9...PCI_MAX_DEVICES - 1] = 0} + {0, 0, 0, 0, 0, 0, 0, 27, 27,[9 ... PCI_MAX_DEVICES - 1] = 0}, + {0, 0, 0, 0, 0, 0, 0, 29, 29,[9 ... PCI_MAX_DEVICES - 1] = 0} #endif }; diff --git a/board/omap1610inn/flash.c b/board/omap1610inn/flash.c index b316c1d80c..9b7e4ad023 100644 --- a/board/omap1610inn/flash.c +++ b/board/omap1610inn/flash.c @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net * - * (C) Copyright 2001 + * (C) Copyright 2001-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * (C) Copyright 2003 @@ -80,6 +80,7 @@ void flash_print_info (flash_info_t * info); void flash_unprotect_sectors (FPWV * addr); int flash_erase (flash_info_t * info, int s_first, int s_last); int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt); +void flash_unlock(flash_info_t * info); /*----------------------------------------------------------------------- */ @@ -118,7 +119,7 @@ unsigned long flash_init (void) /*----------------------------------------------------------------------- */ -flash_unlock(flash_info_t * info) +void flash_unlock(flash_info_t * info) { int j; for (j=2;j