From d39590f9ec85fd7f2dc3c02f3a2a4008fbf038c6 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun, 18 Mar 2012 13:20:27 +0100
Subject: [PATCH] --- yaml --- r: 298496 b: refs/heads/master c:
 450aed725c9a53282483c48ebd012feefae94a07 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/m68k/q40/config.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e978d73b92a0..faa0e16bedfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cfeba53911d6d2f17ebbd1246893557d5ff5aeb
+refs/heads/master: 450aed725c9a53282483c48ebd012feefae94a07
diff --git a/trunk/arch/m68k/q40/config.c b/trunk/arch/m68k/q40/config.c
index 512adb64f7dd..8a1ce327c963 100644
--- a/trunk/arch/m68k/q40/config.c
+++ b/trunk/arch/m68k/q40/config.c
@@ -334,6 +334,9 @@ static __init int q40_add_kbd_device(void)
 {
 	struct platform_device *pdev;
 
+	if (!MACH_IS_Q40)
+		return -ENODEV;
+
 	pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);
 	if (IS_ERR(pdev))
 		return PTR_ERR(pdev);