--- src/sys/platform/pc32/i386/identcpu.c	2007/01/12 22:59:16	1.18
+++ src/sys/platform/pc32/i386/identcpu.c	2007/11/07 17:42:50	1.19
@@ -597,11 +597,9 @@ printcpuinfo(void)
 	case CPUCLASS_286:
 		kprintf("286");
 		break;
-#if defined(I386_CPU)
 	case CPUCLASS_386:
 		kprintf("386");
 		break;
-#endif
 #if defined(I486_CPU)
 	case CPUCLASS_486:
 		kprintf("486");
@@ -783,7 +781,7 @@ void
 panicifcpuunsupported(void)
 {
 
-#if !defined(I386_CPU) && !defined(I486_CPU) && !defined(I586_CPU) && !defined(I686_CPU)
+#if !defined(I486_CPU) && !defined(I586_CPU) && !defined(I686_CPU)
 #error This kernel is not configured for one of the supported CPUs
 #endif
 	/*
@@ -791,10 +789,11 @@ panicifcpuunsupported(void)
 	 * let them know if that machine type isn't configured.
 	 */
 	switch (cpu_class) {
-	case CPUCLASS_286:	/* a 286 should not make it this far, anyway */
-#if !defined(I386_CPU)
+	/*
+	 * A 286 and 386 should not make it this far, anyway.
+	 */
+	case CPUCLASS_286:
 	case CPUCLASS_386:
-#endif
 #if !defined(I486_CPU)
 	case CPUCLASS_486:
 #endif