summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sbshc.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-10-22 23:33:29 -0400
committerLen Brown <len.brown@intel.com>2008-10-22 23:33:29 -0400
commit7674416db4ee3d43813dddb650364ca994755256 (patch)
tree1a4549823d7bdd892dc3b3b7b3fa9214216ac384 /drivers/acpi/sbshc.c
parent0ca9413c234aa5a49ffaf80e46b50721a752e45a (diff)
parent27663c5855b10af9ec67bc7dfba001426ba21222 (diff)
downloadop-kernel-dev-7674416db4ee3d43813dddb650364ca994755256.zip
op-kernel-dev-7674416db4ee3d43813dddb650364ca994755256.tar.gz
Merge branch 'ull' into test
Conflicts: drivers/acpi/bay.c drivers/acpi/dock.c drivers/ata/libata-acpi.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/sbshc.c')
-rw-r--r--drivers/acpi/sbshc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index 001d914..e53e590 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -258,7 +258,7 @@ extern int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
static int acpi_smbus_hc_add(struct acpi_device *device)
{
int status;
- unsigned long val;
+ unsigned long long val;
struct acpi_smb_hc *hc;
if (!device)
OpenPOWER on IntegriCloud