Kill compile warning and correct bitkeeper mismerge

arch/i386/kernel/setup.c

@@ -664,6 +664,7 @@ void __init setup_arch(char **cmdline_p)
  	screen_info = SCREEN_INFO;
 #ifdef CONFIG_APM
 	apm_info.bios = APM_BIOS_INFO;
+#endif
 #ifdef CONFIG_ACPI_SLEEP
 	saved_videomode = VIDEO_MODE;
 	printk("Video mode to be used for restore is %lx\n", saved_videomode);

arch/i386/kernel/time.c

@@ -600,7 +600,9 @@ __initcall(time_init_driverfs);
 
 void __init time_init(void)
 {
+#ifdef CONFIG_X86_TSC
 	extern int x86_udelay_tsc;
+#endif
 	
 	xtime.tv_sec = get_cmos_time();
 	xtime.tv_usec = 0;