From 1954608172b0210a7821252eec7bdb2628d89856 Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Thu, 10 May 2007 20:00:55 +0900
Subject: [PATCH] --- yaml --- r: 56020 b: refs/heads/master c:
 44320f2bcbc05c3f4d62fcdd06fe440d9a803ce0 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/mips/pci/fixup-cobalt.c          | 4 +---
 trunk/include/asm-mips/mach-cobalt/cobalt.h | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 92814e9fa1e0..1ecf6b8a3352 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f009bbf10fe2321a536b4bd922fc8d070ebe27fd
+refs/heads/master: 44320f2bcbc05c3f4d62fcdd06fe440d9a803ce0
diff --git a/trunk/arch/mips/pci/fixup-cobalt.c b/trunk/arch/mips/pci/fixup-cobalt.c
index 7d5f6bbf7a9d..f4acae694a5a 100644
--- a/trunk/arch/mips/pci/fixup-cobalt.c
+++ b/trunk/arch/mips/pci/fixup-cobalt.c
@@ -17,9 +17,7 @@
 #include <asm/io.h>
 #include <asm/gt64120.h>
 
-#include <asm/mach-cobalt/cobalt.h>
-
-extern int cobalt_board_id;
+#include <cobalt.h>
 
 static void qube_raq_galileo_early_fixup(struct pci_dev *dev)
 {
diff --git a/trunk/include/asm-mips/mach-cobalt/cobalt.h b/trunk/include/asm-mips/mach-cobalt/cobalt.h
index 24a8d51a55a3..684a501c04cf 100644
--- a/trunk/include/asm-mips/mach-cobalt/cobalt.h
+++ b/trunk/include/asm-mips/mach-cobalt/cobalt.h
@@ -69,6 +69,8 @@
 #define COBALT_BRD_ID_QUBE2    0x5
 #define COBALT_BRD_ID_RAQ2     0x6
 
+extern int cobalt_board_id;
+
 #define PCI_CFG_SET(devfn,where)					\
 	GT_WRITE(GT_PCI0_CFGADDR_OFS, (0x80000000 | (PCI_SLOT (devfn) << 11) |		\
 		(PCI_FUNC (devfn) << 8) | (where)))