diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 10:24:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 10:24:51 -0700 |
| commit | 043d051615aa5da09a7e44f1edbb69798458e067 (patch) | |
| tree | a0bfe7f6ed6efa4e0eb7f6b9891a0dc3f2fafe57 /arch/ia64/sn/kernel/tiocx.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | [IA64] - Disable tiocx driver on non-SN systems (diff) | |
| download | linux-dev-043d051615aa5da09a7e44f1edbb69798458e067.tar.xz linux-dev-043d051615aa5da09a7e44f1edbb69798458e067.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/sn/kernel/tiocx.c')
| -rw-r--r-- | arch/ia64/sn/kernel/tiocx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c index 8716f4d5314b..c1cbcd1a1398 100644 --- a/arch/ia64/sn/kernel/tiocx.c +++ b/arch/ia64/sn/kernel/tiocx.c @@ -14,6 +14,7 @@ #include <linux/proc_fs.h> #include <linux/device.h> #include <linux/delay.h> +#include <asm/system.h> #include <asm/uaccess.h> #include <asm/sn/sn_sal.h> #include <asm/sn/addrs.h> @@ -481,6 +482,9 @@ static int __init tiocx_init(void) cnodeid_t cnodeid; int found_tiocx_device = 0; + if (!ia64_platform_is("sn2")) + return -ENODEV; + bus_register(&tiocx_bus_type); for (cnodeid = 0; cnodeid < MAX_COMPACT_NODES; cnodeid++) { |