diff options
Diffstat (limited to 'arch/ia64/hp/common/aml_nfw.c')
| -rw-r--r-- | arch/ia64/hp/common/aml_nfw.c | 7 | 
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/ia64/hp/common/aml_nfw.c b/arch/ia64/hp/common/aml_nfw.c index 22078486d35..84715fcbba0 100644 --- a/arch/ia64/hp/common/aml_nfw.c +++ b/arch/ia64/hp/common/aml_nfw.c @@ -23,15 +23,14 @@   */  #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h>  #include <asm/sal.h>  MODULE_AUTHOR("Bjorn Helgaas <bjorn.helgaas@hp.com>");  MODULE_LICENSE("GPL");  MODULE_DESCRIPTION("ACPI opregion handler for native firmware calls"); -static int force_register; +static bool force_register;  module_param_named(force, force_register, bool, 0);  MODULE_PARM_DESC(force, "Install opregion handler even without HPQ5001 device"); @@ -191,7 +190,7 @@ static int aml_nfw_add(struct acpi_device *device)  	return aml_nfw_add_global_handler();  } -static int aml_nfw_remove(struct acpi_device *device, int type) +static int aml_nfw_remove(struct acpi_device *device)  {  	return aml_nfw_remove_global_handler();  }  | 
