summaryrefslogtreecommitdiff
path: root/arch/ia64/sn/kernel/setup.c
diff options
context:
space:
mode:
authorAaron Young <ayoung@google.engr.sgi.com>2006-06-28 08:34:55 -0700
committerTony Luck <tony.luck@intel.com>2006-06-28 10:02:42 -0700
commitd3e5e1a1b4f43bcfa1a34516e233911487c67307 (patch)
treef98c62a079e929f2bd8669bfbcf23b2d0d64f06e /arch/ia64/sn/kernel/setup.c
parent59e2e6892087ba05101f86309a23c4f5a3ac04a6 (diff)
downloadlinux-next-d3e5e1a1b4f43bcfa1a34516e233911487c67307.tar.gz
[IA64-SGI] fix prom revision checks in SN kernel
The following patch fixes two spots in the SN kernel that check a fixed prom revision number to determine prom feature support. These checks are only valid on shub1 systems. They are invalid on shub2 systems which have a different prom with different revision numbers. Signed-off-by: Aaron Young <ayoung@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn/kernel/setup.c')
-rw-r--r--arch/ia64/sn/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 97579348a549..3bfccf354343 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/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;