Commit 21990267 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Tony Luck
Browse files

[IA64] remove unused acpi_kbd_controller_present, acpi_legacy_devices 



Nobody uses either one anymore.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 8611342f

arch/ia64/kernel/acpi.c

+0 −9
Original line number Diff line number Diff line
@@ -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;
@@ -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;

}

arch/ia64/sn/kernel/setup.c

+0 −12
Original line number Diff line number Diff line
@@ -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);



	/*