diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 13:36:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 13:36:22 -0500 |
| commit | bc535154137601400ffe44c2a7be047ca041fe06 (patch) | |
| tree | 1b6ad05ec2a458d44a384aa90b2ef914c6ce4d52 /arch/ia64 | |
| parent | d03ab7ff335b7fbf48d0fd28ead5d7957798510b (diff) | |
| parent | 439913fffd39374c3737186b22d2d56c3a0ae526 (diff) | |
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: replace acpi_integer by u64
ACPICA: Update version to 20100121.
ACPICA: Remove unused uint32_struct type
ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object
ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type
ACPICA: Predefined name repair: fix NULL package elements
ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls
ACPICA: Update all ACPICA copyrights and signons to 2010
ACPICA: Update for new gcc-4 warning options
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/hp/common/aml_nfw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/hp/common/aml_nfw.c b/arch/ia64/hp/common/aml_nfw.c index 4abd2c79bb1..22078486d35 100644 --- a/arch/ia64/hp/common/aml_nfw.c +++ b/arch/ia64/hp/common/aml_nfw.c | |||
| @@ -77,7 +77,7 @@ static void aml_nfw_execute(struct ia64_nfw_context *c) | |||
| 77 | c->arg[4], c->arg[5], c->arg[6], c->arg[7]); | 77 | c->arg[4], c->arg[5], c->arg[6], c->arg[7]); |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | static void aml_nfw_read_arg(u8 *offset, u32 bit_width, acpi_integer *value) | 80 | static void aml_nfw_read_arg(u8 *offset, u32 bit_width, u64 *value) |
| 81 | { | 81 | { |
| 82 | switch (bit_width) { | 82 | switch (bit_width) { |
| 83 | case 8: | 83 | case 8: |
| @@ -95,7 +95,7 @@ static void aml_nfw_read_arg(u8 *offset, u32 bit_width, acpi_integer *value) | |||
| 95 | } | 95 | } |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | static void aml_nfw_write_arg(u8 *offset, u32 bit_width, acpi_integer *value) | 98 | static void aml_nfw_write_arg(u8 *offset, u32 bit_width, u64 *value) |
| 99 | { | 99 | { |
| 100 | switch (bit_width) { | 100 | switch (bit_width) { |
| 101 | case 8: | 101 | case 8: |
| @@ -114,7 +114,7 @@ static void aml_nfw_write_arg(u8 *offset, u32 bit_width, acpi_integer *value) | |||
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | static acpi_status aml_nfw_handler(u32 function, acpi_physical_address address, | 116 | static acpi_status aml_nfw_handler(u32 function, acpi_physical_address address, |
| 117 | u32 bit_width, acpi_integer *value, void *handler_context, | 117 | u32 bit_width, u64 *value, void *handler_context, |
| 118 | void *region_context) | 118 | void *region_context) |
| 119 | { | 119 | { |
| 120 | struct ia64_nfw_context *context = handler_context; | 120 | struct ia64_nfw_context *context = handler_context; |