---

yaml --- r: 142282 b: refs/heads/master c: 06e82df h: refs/heads/master v: v3
git-mirror · Apr 6, 2009 · 50e51fc · 50e51fc
1 parent 367c0e3
commit 50e51fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e713abead3324f6d4381a3d280b7ce35b7eadb7a
+refs/heads/master: 06e82df015afad2d96d030f76f5e4d13e6dcdfa4
diff --git a/trunk/include/linux/serial_core.h b/trunk/include/linux/serial_core.h
@@ -277,7 +277,7 @@ struct uart_port {
 	struct uart_icount	icount;			/* statistics */
 
 	struct console		*cons;			/* struct console, if any */
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
+#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(SUPPORT_SYSRQ)
 	unsigned long		sysrq;			/* sysrq timeout */
 #endif