diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:38 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:38 -0400 |
| commit | e9dd2561793c05d70c9df1bc16a2dde6f23388df (patch) | |
| tree | 20099972569cc0748133a6351600fff9cbb15f4a /arch/ia64/sn/kernel/io_init.c | |
| parent | d011e151bc5d1a581bf35b492a4fde44d30382b9 (diff) | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
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; /* |