diff options
| -rw-r--r-- | sys/conf/options.ia64 | 2 | ||||
| -rw-r--r-- | sys/ia64/ia64/machdep.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64 index 79fc50d1c5f6..524f09d2b9b6 100644 --- a/sys/conf/options.ia64 +++ b/sys/conf/options.ia64 @@ -71,4 +71,4 @@ SSC_NSECT opt_ski.h # Device options DEV_SPLASH opt_splash.h -DEV_ACPICA opt_acpica.h +DEV_ACPI opt_acpi.h diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index d3f5363235e3..454cf4963834 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -30,10 +30,10 @@ #include "opt_ddb.h" #include "opt_ski.h" #include "opt_msgbuf.h" -#include "opt_acpica.h" +#include "opt_acpi.h" -#if !defined(SKI) && !defined(DEV_ACPICA) -#error "You need the SKI option and/or the acpica device" +#if !defined(SKI) && !defined(DEV_ACPI) +#error "You need the SKI option and/or the acpi device" #endif #include <sys/param.h> @@ -232,7 +232,7 @@ cpu_startup(dummy) vm_pager_bufferinit(); if (!ia64_running_in_simulator()) { -#ifdef DEV_ACPICA +#ifdef DEV_ACPI /* * Traverse the MADT to discover IOSAPIC and Local SAPIC * information. @@ -243,7 +243,7 @@ cpu_startup(dummy) /* * It is an error to boot a SKI-only kernel on hardware. */ - panic("Mandatory 'device acpica' is missing"); + panic("Mandatory 'device acpi' is missing"); #endif } } |