From 5e52091f26e34e1b5f1d508d79053a6669c7cbea Mon Sep 17 00:00:00 2001 From: Aaron Young Date: Wed, 28 Jun 2006 08:34:55 -0700 Subject: [PATCH] --- yaml --- r: 30987 b: refs/heads/master c: d3e5e1a1b4f43bcfa1a34516e233911487c67307 h: refs/heads/master i: 30985: 7892d717dce14566d364612cbd01c8f9ff3e6397 30983: 47a8e60af91ea9b92c7f5676b35670b0a1e9d89a v: v3 --- [refs] | 2 +- trunk/arch/ia64/sn/kernel/setup.c | 2 +- trunk/arch/ia64/sn/pci/tioca_provider.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cfa7958bea7a..96f708a1fd48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59e2e6892087ba05101f86309a23c4f5a3ac04a6 +refs/heads/master: d3e5e1a1b4f43bcfa1a34516e233911487c67307 diff --git a/trunk/arch/ia64/sn/kernel/setup.c b/trunk/arch/ia64/sn/kernel/setup.c index 97579348a549..3bfccf354343 100644 --- a/trunk/arch/ia64/sn/kernel/setup.c +++ b/trunk/arch/ia64/sn/kernel/setup.c @@ -458,7 +458,7 @@ void __init sn_setup(char **cmdline_p) * support here so we don't have to listen to failed keyboard probe * messages. */ - if (version <= 0x0209 && acpi_kbd_controller_present) { + if (is_shub1() && version <= 0x0209 && acpi_kbd_controller_present) { printk(KERN_INFO "Disabling legacy keyboard support as prom " "is too old and doesn't provide FADT\n"); acpi_kbd_controller_present = 0; diff --git a/trunk/arch/ia64/sn/pci/tioca_provider.c b/trunk/arch/ia64/sn/pci/tioca_provider.c index 20de72791b97..e4aa839d0189 100644 --- a/trunk/arch/ia64/sn/pci/tioca_provider.c +++ b/trunk/arch/ia64/sn/pci/tioca_provider.c @@ -595,7 +595,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont /* sanity check prom rev */ - if (sn_sal_rev() < 0x0406) { + if (is_shub1() && sn_sal_rev() < 0x0406) { printk (KERN_ERR "%s: SGI prom rev 4.06 or greater required " "for tioca support\n", __FUNCTION__);