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>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 2b7c45e39370..b291ee68b4f1 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -183,7 +183,7 @@ static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status)
         union acpi_object args[2]; 
         struct acpi_object_list params = { .pointer = args, .count = 2 };
         acpi_status stat; 
-        unsigned long rc;
+        unsigned long long rc;
         union apci_descriptor *ibm_slot;
 
         ibm_slot = ibm_slot_from_id(hpslot_to_sun(slot));