From e0b48bb51d47635dded61b21783c86d0ecbadfd1 Mon Sep 17 00:00:00 2001
From: Jes Sorensen <jes@sgi.com>
Date: Mon, 13 Feb 2006 05:35:01 -0500
Subject: [PATCH] --- yaml --- r: 20439 b: refs/heads/master c:
 26d10915de3030a55253dba3b2b145402cdf6429 h: refs/heads/master i:   20437:
 05d4906d969a7f7ab1e45ded2d115ddda3279446   20435:
 d4a445e32a5dd576a5eadca4fb9efb5ef38cf51e   20431:
 a735a8047588df4984fde2a469877fb8a86542cf v: v3

---
 [refs]                            | 2 +-
 trunk/arch/ia64/sn/kernel/setup.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a291feab49a3..d848525239fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3454344b3507042e5d561d0cfed19e99cf2fc88
+refs/heads/master: 26d10915de3030a55253dba3b2b145402cdf6429
diff --git a/trunk/arch/ia64/sn/kernel/setup.c b/trunk/arch/ia64/sn/kernel/setup.c
index 48645ac120fc..1672ecad77e2 100644
--- a/trunk/arch/ia64/sn/kernel/setup.c
+++ b/trunk/arch/ia64/sn/kernel/setup.c
@@ -317,6 +317,7 @@ struct pcdp_vga_device {
 #define PCDP_PCI_TRANS_IOPORT	0x02
 #define PCDP_PCI_TRANS_MMIO	0x01
 
+#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
 static void
 sn_scan_pcdp(void)
 {
@@ -358,6 +359,7 @@ sn_scan_pcdp(void)
 		break; /* once we find the primary, we're done */
 	}
 }
+#endif
 
 static unsigned long sn2_rtc_initial;