Patchwork [U-Boot,4/5] x86: Remove duplicate PCI init

login
register
mail settings
Submitter Graeme Russ
Date April 29, 2012, noon
Message ID <1335700823-15144-5-git-send-email-graeme.russ@gmail.com>
Download mbox | patch
Permalink /patch/155729/
State Superseded, archived
Delegated to: Simon Glass
Headers show

Comments

Graeme Russ - April 29, 2012, noon
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
---
 arch/x86/lib/board.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
Simon Glass - Nov. 28, 2012, 1:15 a.m.
On Sun, Apr 29, 2012 at 5:00 AM, Graeme Russ <graeme.russ@gmail.com> wrote:
>
> Signed-off-by: Graeme Russ <graeme.russ@gmail.com>

Applied to x86/next.

Patch

diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index 100ac1e..8c8b6fe 100644
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -169,9 +169,6 @@  init_fnc_t *init_sequence_r[] = {
 #ifdef CONFIG_MISC_INIT_R
 	misc_init_r,
 #endif
-#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_IDE)
-	pci_init_r,
-#endif
 #if defined(CONFIG_CMD_KGDB)
 	kgdb_init_r,
 #endif