summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-14 01:10:54 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-14 01:10:54 +0200
commit3384a04ed42c583755226374e1ff6a53db7f27c3 (patch)
tree91f0138bb69ba1afe7302df4b285ef760d96f426
parent[TCP]: Ratelimit debugging warning. (diff)
parentPull mbcs-init-sn-check into release branch (diff)
downloadlinux-3384a04ed42c583755226374e1ff6a53db7f27c3.tar.xz
linux-3384a04ed42c583755226374e1ff6a53db7f27c3.zip
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
-rw-r--r--drivers/char/mbcs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index 3fa64c631108..c268ee04b2aa 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) {