diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 17:49:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 17:49:19 -0700 |
| commit | 3bee9df0ab55add6f8df92267a8a3d9d339cce08 (patch) | |
| tree | 0957c90aaba3918b820d26f27ea6c2a710ed08e5 /arch/ia64/sn/kernel | |
| parent | 73ed9a86cd77b6a3b46beec8d353ac3b0d4f50c1 (diff) | |
| parent | 9b3377f9921766b6193861d0e3194854b1d765fe (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Count resched interrupts
[IA64] remove unused acpi_kbd_controller_present, acpi_legacy_devices
[IA64] update sn2_defconfig
[IA64] reformat pal.S to fit in 80 columns, fix typos
[IA64] remove unused PAL_CALL_IC_OFF
[IA64] - Allow IPIs in timer loop
[IA64] move ioremap/ioremap_nocache under __KERNEL__
[IA64] perfmon fix for global IRQ fix
Diffstat (limited to 'arch/ia64/sn/kernel')
| -rw-r--r-- | arch/ia64/sn/kernel/setup.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index 5f2dcba7fa8..7a2d824c5ce 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c @@ -65,7 +65,6 @@ extern void sn_timer_init(void); extern unsigned long last_time_offset; extern void (*ia64_mark_idle) (int); extern void snidle(int); -extern unsigned char acpi_kbd_controller_present; extern unsigned long long (*ia64_printk_clock)(void); unsigned long sn_rtc_cycles_per_second; @@ -452,17 +451,6 @@ void __init sn_setup(char **cmdline_p) ia64_printk_clock = ia64_sn2_printk_clock; - /* - * Old PROMs do not provide an ACPI FADT. Disable legacy keyboard - * support here so we don't have to listen to failed keyboard probe - * messages. - */ - 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; - } - printk("SGI SAL version %x.%02x\n", version >> 8, version & 0x00FF); /* |