Commit 7674416d authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'ull' into test 



Conflicts:
	drivers/acpi/bay.c
	drivers/acpi/dock.c
	drivers/ata/libata-acpi.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 0ca9413c 27663c58

arch/ia64/sn/kernel/io_acpi_init.c

+4 −4
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ sn_extract_device_info(acpi_handle handle, struct pcidev_info **pcidev_info, 
static unsigned int

get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle)

{

	unsigned long adr;

	unsigned long long adr;

	acpi_handle child;

	unsigned int devfn;

	int function;
@@ -292,8 +292,8 @@ get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle) 
static acpi_status

find_matching_device(acpi_handle handle, u32 lvl, void *context, void **rv)

{

	unsigned long bbn = -1;

	unsigned long adr;

	unsigned long long bbn = -1;

	unsigned long long adr;

	acpi_handle parent = NULL;

	acpi_status status;

	unsigned int devfn;
@@ -348,7 +348,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, 
	unsigned int host_devfn;

	struct sn_pcidev_match pcidev_match;

	acpi_handle rootbus_handle;

	unsigned long segment;

	unsigned long long segment;

	acpi_status status;



	rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle;

drivers/acpi/ac.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct acpi_ac { 
	struct power_supply charger;

#endif

	struct acpi_device * device;

	unsigned long state;

	unsigned long long state;

};



#define to_acpi_ac(x) container_of(x, struct acpi_ac, charger);

drivers/acpi/acpi_memhotplug.c

+2 −3
Original line number Diff line number Diff line
@@ -194,8 +194,7 @@ acpi_memory_get_device(acpi_handle handle, 


static int acpi_memory_check_device(struct acpi_memory_device *mem_device)

{

	unsigned long current_status;



	unsigned long long current_status;



	/* Get device present/absent information from the _STA */

	if (ACPI_FAILURE(acpi_evaluate_integer(mem_device->device->handle, "_STA",
@@ -264,7 +263,7 @@ static int acpi_memory_powerdown_device(struct acpi_memory_device *mem_device) 
	acpi_status status;

	struct acpi_object_list arg_list;

	union acpi_object arg;

	unsigned long current_status;

	unsigned long long current_status;





	/* Issue the _EJ0 command */

drivers/acpi/asus_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ static int get_lcd_state(void) 
			/* That's what the AML code does */

			lcd = out_obj.integer.value >> 8;

	} else if (hotk->model == F3Sa) {

		unsigned long tmp;

		unsigned long long tmp;

		union acpi_object param;

		struct acpi_object_list input;

		acpi_status status;

drivers/acpi/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ EXPORT_SYMBOL(acpi_bus_get_device); 
int acpi_bus_get_status(struct acpi_device *device)

{

	acpi_status status = AE_OK;

	unsigned long sta = 0;

	unsigned long long sta = 0;





	if (!device)
@@ -172,7 +172,7 @@ int acpi_bus_get_power(acpi_handle handle, int *state) 
	int result = 0;

	acpi_status status = 0;

	struct acpi_device *device = NULL;

	unsigned long psc = 0;

	unsigned long long psc = 0;





	result = acpi_bus_get_device(handle, &device);