From 993a22756e3545bf11fbe267feadbfdd5b67ffa4 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sun, 12 Mar 2006 16:54:11 +0100
Subject: [PATCH] Fix bad declaration on pci_cfgfunc_nothing Patch by Sam Song,
19 Jun 2005
---
CHANGELOG | 3 +++
include/pci.h | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 18f01cb371..0b6da7bbd4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Fix bad declaration on pci_cfgfunc_nothing
+ Patch by Sam Song, 19 Jun 2005
+
* Adjust "echo" as a default command
Patch by Sam Song, 19 Jun 2005
diff --git a/include/pci.h b/include/pci.h
index 8f19997559..4bb2df27ed 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -351,8 +351,8 @@ struct pci_config_table {
unsigned long priv[3];
};
-extern void pci_cfgfunc_nothing(struct pci_controller* hose, pci_dev_t dev,
- struct pci_config_table *);
+extern void pci_cfgfunc_do_nothing(struct pci_controller* hose, pci_dev_t dev,
+ struct pci_config_table *);
extern void pci_cfgfunc_config_device(struct pci_controller* hose, pci_dev_t dev,
struct pci_config_table *);