[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Werner Almesberger]

The following commit has been merged in the andy-tracking branch:
commit c27d79fe94b525fad9ac56113e9a04d310201cc9
Author: tim.niemeyer at mastersword.de <tim.niemeyer at mastersword.de>
Date:   Sun Mar 22 17:42:32 2009 +0100

    Remove debug-aux-key-probe-resume-death.patch
    
    Get resume by AUX to work.
    
    Signed-off-by: Tim Niemeyer <reddog at mastersword.de>

diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
index 56bc9ee..56d3a68 100644
--- a/drivers/input/keyboard/neo1973kbd.c
+++ b/drivers/input/keyboard/neo1973kbd.c
@@ -145,16 +145,6 @@ static void aux_key_timer_f(unsigned long data)
 
 static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev)
 {
-	int *p = NULL;
-
-	if (machine_is_neo1973_gta01()) {
-		/* if you stall inside resume then AUX will force a panic,
-		   which in turn forces a dump of the pending syslog */
-
-		if (global_inside_suspend)
-			printk(KERN_ERR "death %d\n", *p);
-	}
-
 	mod_timer(&aux_key_timer, jiffies + AUX_TIMER_TIMEOUT);
 
 	return IRQ_HANDLED;

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko