Merge bk://kernel.bkbits.net//home/mochel/linux-2.5-power

into home.osdl.org:/home/torvalds/v2.5/linux

arch/i386/kernel/acpi/sleep.c

@@ -15,6 +15,8 @@ unsigned long acpi_wakeup_address = 0;
 unsigned long acpi_video_flags;
 extern char wakeup_start, wakeup_end;
 
+extern void zap_low_mappings(void);
+
 extern unsigned long FASTCALL(acpi_copy_wakeup_routine(unsigned long));
 
 static void init_low_mapping(pgd_t *pgd, int pgd_limit)

arch/i386/kernel/dmi_scan.c

@@ -444,13 +444,6 @@ static __init int reset_videomode_after_s3(struct dmi_blacklist *d)
 	acpi_video_flags |= 2;
 	return 0;
 }
-
-static __init int reset_videobios_after_s3(struct dmi_blacklist *d)
-{
-	extern long acpi_video_flags;
-	acpi_video_flags |= 1;
-	return 0;
-}
 #endif
 
 /*

drivers/acpi/sleep/main.c

@@ -21,6 +21,8 @@ ACPI_MODULE_NAME		("sleep")
 
 u8 sleep_states[ACPI_S_STATE_COUNT];
 
+extern void do_suspend_lowlevel_s4bios(int);
+
 /**
  * acpi_system_restore_state - OS-specific restoration of state
  * @state:	sleep state we're exiting