diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 15:16:35 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 15:16:35 +0200 |
| commit | ad73c67e792c752ddc99f2b0587abae05255dd6d (patch) | |
| tree | e33d5d37a8c56b6fad753fa2d481f43cfb60ae1d /drivers/char/snsc.c | |
| parent | [GFS2] match plock result with correct request (diff) | |
| parent | Linux v2.6.18-rc4 (diff) | |
| download | linux-ad73c67e792c752ddc99f2b0587abae05255dd6d.tar.xz linux-ad73c67e792c752ddc99f2b0587abae05255dd6d.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/snsc.c')
| -rw-r--r-- | drivers/char/snsc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index afc6eda602f7..07e0b75f2338 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c @@ -374,7 +374,12 @@ scdrv_init(void) struct sysctl_data_s *scd; void *salbuf; dev_t first_dev, dev; - nasid_t event_nasid = ia64_sn_get_console_nasid(); + nasid_t event_nasid; + + if (!ia64_platform_is("sn2")) + return -ENODEV; + + event_nasid = ia64_sn_get_console_nasid(); if (alloc_chrdev_region(&first_dev, 0, num_cnodes, SYSCTL_BASENAME) < 0) { |