From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 13 Oct 2005 23:10:54 +0000 (-0700)
Subject: Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: daily-2014.03.25.0_l4t/l4t-r19.1~50463^2~50^2~68
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=commitdiff_plain;h=3384a04ed42c583755226374e1ff6a53db7f27c3;hp=046d20b73960b7a2474b6d5e920d54c3fd7c23fe

Merge branch 'release' of /linux/kernel/git/aegl/linux-2.6
---

diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index 3fa64c63110..c268ee04b2a 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -830,6 +830,9 @@ static int __init mbcs_init(void)
 {
 	int rv;
 
+	if (!ia64_platform_is("sn2"))
+		return -ENODEV;
+
 	// Put driver into chrdevs[].  Get major number.
 	rv = register_chrdev(mbcs_major, DEVICE_NAME, &mbcs_ops);
 	if (rv < 0) {