summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/toshiba_bluetooth.c
diff options
context:
space:
mode:
authorLin Ming2010-01-28 03:53:19 +0100
committerLen Brown2010-01-28 07:47:33 +0100
commit439913fffd39374c3737186b22d2d56c3a0ae526 (patch)
treef6d5c809c1b77950a2cf7174fdee8667d527c87b /drivers/platform/x86/toshiba_bluetooth.c
parentACPICA: Update version to 20100121. (diff)
downloadkernel-qcow2-linux-439913fffd39374c3737186b22d2d56c3a0ae526.tar.gz
kernel-qcow2-linux-439913fffd39374c3737186b22d2d56c3a0ae526.tar.xz
kernel-qcow2-linux-439913fffd39374c3737186b22d2d56c3a0ae526.zip
ACPI: replace acpi_integer by u64
acpi_integer is now obsolete and removed from the ACPICA code base, replaced by u64. Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86/toshiba_bluetooth.c')
-rw-r--r--drivers/platform/x86/toshiba_bluetooth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c
index a350418e87ea..944068611919 100644
--- a/drivers/platform/x86/toshiba_bluetooth.c
+++ b/drivers/platform/x86/toshiba_bluetooth.c
@@ -57,7 +57,7 @@ static struct acpi_driver toshiba_bt_rfkill_driver = {
static int toshiba_bluetooth_enable(acpi_handle handle)
{
acpi_status res1, res2;
- acpi_integer result;
+ u64 result;
/*
* Query ACPI to verify RFKill switch is set to 'on'.
@@ -95,7 +95,7 @@ static int toshiba_bt_resume(struct acpi_device *device)
static int toshiba_bt_rfkill_add(struct acpi_device *device)
{
acpi_status status;
- acpi_integer bt_present;
+ u64 bt_present;
int result = -ENODEV;
/*