From: wdenk <wdenk>
Date: Thu, 12 Feb 2004 15:11:57 +0000 (+0000)
Subject: Last minute fixes / cleanup.
X-Git-Tag: LABEL_2006_03_12_0025~651
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=198ea9e294e38cea49f9f2d9b911bdfdd20e48dc;p=oweals%2Fu-boot.git

Last minute fixes / cleanup.
---

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<CFG_MAX_FLASH_SECT;j++){
diff --git a/rtc/ds1306.c b/rtc/ds1306.c
index e6694615ed..4d1115ee4b 100644
--- a/rtc/ds1306.c
+++ b/rtc/ds1306.c
@@ -71,12 +71,12 @@ extern int spi_chipsel_cnt;
 
 static unsigned int bin2bcd (unsigned int n);
 static unsigned char bcd2bin (unsigned char c);
-static unsigned char rtc_read (unsigned char reg);
-static void rtc_write (unsigned char reg, unsigned char val);
 
 /* ************************************************************************* */
 #ifdef CONFIG_SXNI855T		/* !!! SHOULD BE CHANGED TO NEW CODE !!! */
 
+static unsigned char rtc_read (unsigned char reg);
+static void rtc_write (unsigned char reg, unsigned char val);
 static void soft_spi_send (unsigned char n);
 static unsigned char soft_spi_read (void);
 static void init_spi (void);