diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-16 01:19:52 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-16 01:19:52 +0100 |
| commit | 18594822fcb01d4b35e05b9018f770a0b4156d1a (patch) | |
| tree | 38d35c38086a564beaac215f8e52694cdbfab1c3 /arch/i386/kernel/acpi/boot.c | |
| parent | 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce (diff) | |
| parent | c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'arch/i386/kernel/acpi/boot.c')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 4c785a67d58..40e5aba3ad3 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -1102,9 +1102,6 @@ int __init acpi_boot_table_init(void) dmi_check_system(acpi_dmi_table); #endif - if (!cpu_has_apic) - return -ENODEV; - /* * If acpi_disabled, bail out * One exception: acpi=ht continues far enough to enumerate LAPICs @@ -1151,9 +1148,6 @@ int __init acpi_boot_init(void) acpi_table_parse(ACPI_BOOT, acpi_parse_sbf); - if (!cpu_has_apic) - return -ENODEV; - /* * set sci_int and PM timer address */ |