[Hackndev-commit] SF.net SVN: hackndev: [1267] linux4palm/linux/trunk/kernel/power/console.c

[<ke...@us...>]

Revision: 1267
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1267&view=rev
Author:   keddar
Date:     2007-08-24 16:46:45 -0700 (Fri, 24 Aug 2007)

Log Message:
-----------
HnD: kernel cleanup - console hack removal

Modified Paths:
--------------
    linux4palm/linux/trunk/kernel/power/console.c

Modified: linux4palm/linux/trunk/kernel/power/console.c
===================================================================
--- linux4palm/linux/trunk/kernel/power/console.c	2007-08-24 22:57:20 UTC (rev 1266)
+++ linux4palm/linux/trunk/kernel/power/console.c	2007-08-24 23:46:45 UTC (rev 1267)
@@ -16,15 +16,6 @@
 
 int pm_prepare_console(void)
 {
-	/* <Alex>
-	 * OPIE locks the console so we can't switch vts, this means we hang when 
-	 * trying to suspend. I'm not sure how we're supposed to get around it,
-	 * other than this. The suspend console is ugly, anyhow. ;-)
-	 */
-#ifndef CONFIG_MACH_PALMZ72
-#ifndef CONFIG_MACH_XSCALE_PALMLD
-#ifndef CONFIG_MACH_T3XSCALE
-
 	acquire_console_sem();
 
 	orig_fgconsole = fg_console;
@@ -53,24 +44,15 @@
 	}
 	orig_kmsg = kmsg_redirect;
 	kmsg_redirect = SUSPEND_CONSOLE;
-#endif
-#endif
-#endif
 	return 0;
 }
 
 void pm_restore_console(void)
 {
-#ifndef CONFIG_MACH_PALMZ72
-#ifndef CONFIG_MACH_XSCALE_PALMLD
-#ifndef CONFIG_MACH_T3XSCALE
 	acquire_console_sem();
 	set_console(orig_fgconsole);
 	release_console_sem();
 	kmsg_redirect = orig_kmsg;
-#endif
-#endif
-#endif
 	return;
 }
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.