From 53604696902db219d8f262eacd62d87bc8bc1afc Mon Sep 17 00:00:00 2001
From: Max Filippov <jcmvbkbc@gmail.com>
Date: Sun, 31 Mar 2013 01:08:22 +0400
Subject: [PATCH] --- yaml --- r: 374977 b: refs/heads/master c:
 b06c14e5c11a7e3fb9b4d94bb83847bf1fbbdaa3 h: refs/heads/master i:   374975:
 e2cd586c572185f8656541c26cc6dcab7431af65 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/xtensa/kernel/platform.c     | 1 +
 trunk/arch/xtensa/platforms/iss/setup.c | 6 ------
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ca4518c209d7..e4bd38ccf621 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e44fd012bf3366e3a4c73a06f63756f92d39f06
+refs/heads/master: b06c14e5c11a7e3fb9b4d94bb83847bf1fbbdaa3
diff --git a/trunk/arch/xtensa/kernel/platform.c b/trunk/arch/xtensa/kernel/platform.c
index 44bf21c3769a..2bd6c351f37c 100644
--- a/trunk/arch/xtensa/kernel/platform.c
+++ b/trunk/arch/xtensa/kernel/platform.c
@@ -36,6 +36,7 @@ _F(void, power_off, (void), { while(1); });
 _F(void, idle, (void), { __asm__ __volatile__ ("waiti 0" ::: "memory"); });
 _F(void, heartbeat, (void), { });
 _F(int,  pcibios_fixup, (void), { return 0; });
+_F(void, pcibios_init, (void), { });
 
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 _F(void, calibrate_ccount, (void),
diff --git a/trunk/arch/xtensa/platforms/iss/setup.c b/trunk/arch/xtensa/platforms/iss/setup.c
index b68916fd0d7a..da7d18240866 100644
--- a/trunk/arch/xtensa/platforms/iss/setup.c
+++ b/trunk/arch/xtensa/platforms/iss/setup.c
@@ -38,12 +38,6 @@ void __init platform_init(bp_tag_t* bootparam)
 
 }
 
-#ifdef CONFIG_PCI
-void platform_pcibios_init(void)
-{
-}
-#endif
-
 void platform_halt(void)
 {
 	pr_info(" ** Called platform_halt() **\n");