Skip to content

Commit

Permalink
[IA64] remove unused acpi_kbd_controller_present, acpi_legacy_devices
Browse files Browse the repository at this point in the history
Nobody uses either one anymore.

Signed-off-by: Bjorn Helgaas <[email protected]>
Signed-off-by: Tony Luck <[email protected]>
  • Loading branch information
Bjorn Helgaas authored and aegl committed Oct 17, 2006
1 parent 8611342 commit 2199026
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
9 changes: 0 additions & 9 deletions arch/ia64/kernel/acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ EXPORT_SYMBOL(pm_idle);
void (*pm_power_off) (void);
EXPORT_SYMBOL(pm_power_off);

unsigned char acpi_kbd_controller_present = 1;
unsigned char acpi_legacy_devices;

unsigned int acpi_cpei_override;
unsigned int acpi_cpei_phys_cpuid;

Expand Down Expand Up @@ -628,12 +625,6 @@ static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size)

fadt = (struct fadt_descriptor *)fadt_header;

if (!(fadt->iapc_boot_arch & BAF_8042_KEYBOARD_CONTROLLER))
acpi_kbd_controller_present = 0;

if (fadt->iapc_boot_arch & BAF_LEGACY_DEVICES)
acpi_legacy_devices = 1;

acpi_register_gsi(fadt->sci_int, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);
return 0;
}
Expand Down
12 changes: 0 additions & 12 deletions arch/ia64/sn/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

/*
Expand Down

0 comments on commit 2199026

Please sign in to comment.