diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 21:03:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 21:03:03 -0700 |
commit | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (patch) | |
tree | 59cbb1af2c6de429b88818441e31963ec0aad42b /arch/ia64/sn/kernel/io_init.c | |
parent | 2949ccf9379678df66ecf2ca70ed4656159eacdd (diff) | |
parent | 0647d8cfd40f7974335884d73deef83feeffc2a0 (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/sn/kernel/io_init.c')
-rw-r--r-- | arch/ia64/sn/kernel/io_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index 9e07f5463f2..783eb432384 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c @@ -384,7 +384,7 @@ static int __init sn_pci_init(void) extern void register_sn_procfs(void); #endif - if (!ia64_platform_is("sn2") || IS_RUNNING_ON_SIMULATOR()) + if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM()) return 0; /* |