summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-17 16:11:18 -0700
committerBin Meng <bmeng.cn@gmail.com>2016-01-24 12:08:16 +0800
commit2b27d205290b43418c7f51026915782551f03e6b (patch)
treea9b2d118bebb5332d0ae5f84ba10879d2835ae06 /arch/x86/include
parent977a59189303277a7ec3906cc91d93ed440ca52e (diff)
downloadblackbird-obmc-uboot-2b27d205290b43418c7f51026915782551f03e6b.tar.gz
blackbird-obmc-uboot-2b27d205290b43418c7f51026915782551f03e6b.zip
x86: ivybridge: Rename lpc_init() to lpc_init_extra()
In preparation for adding an init() method to the LPC uclass, rename this existing function so that it will not conflict. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/arch-ivybridge/pch.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/arch-ivybridge/pch.h b/arch/x86/include/asm/arch-ivybridge/pch.h
index 19cd7e5beb..f35803bbf4 100644
--- a/arch/x86/include/asm/arch-ivybridge/pch.h
+++ b/arch/x86/include/asm/arch-ivybridge/pch.h
@@ -470,7 +470,7 @@ void pch_iobp_update(u32 address, u32 andvalue, u32 orvalue);
#define DMISCI_STS (1 << 9)
#define TCO2_STS 0x66
-int lpc_init(struct pci_controller *hose, pci_dev_t dev);
+int lpc_init_extra(struct pci_controller *hose, pci_dev_t dev);
void lpc_enable(pci_dev_t dev);
#endif
OpenPOWER on IntegriCloud