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/pci/tioca_provider.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/pci/tioca_provider.c')
| -rw-r--r-- | arch/ia64/sn/pci/tioca_provider.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index 05aa8c2fe9bb..51cc4e63092c 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c @@ -589,8 +589,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft) /* sanity check prom rev */ - if (sn_sal_rev_major() < 4 || - (sn_sal_rev_major() == 4 && sn_sal_rev_minor() < 6)) { + if (sn_sal_rev() < 0x0406) { printk (KERN_ERR "%s: SGI prom rev 4.06 or greater required " "for tioca support\n", __FUNCTION__); |