---

yaml --- r: 20439 b: refs/heads/master c: 26d1091 h: refs/heads/master i: 20437: 05d4906 20435: d4a445e 20431: a735a80 v: v3
git-mirror · Feb 15, 2006 · e0b48bb · e0b48bb
1 parent 7b37e14
commit e0b48bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;