diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 22:44:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 22:44:23 -0400 |
| commit | 8b6b4628126fd73d0a53b499a26133c15b73c1e6 (patch) | |
| tree | d5ae977face87faefbcd7487d118d99485107227 /arch | |
| parent | f03683b8fb7e03862d2f1366a16c1b01732a5741 (diff) | |
| parent | 1eb9a4b8a3c8a141cf2ab27309f089923b69c707 (diff) | |
Merge branch 'fixefi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'fixefi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
efi: Fix argument types for SetVariable() for ia64
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index 6fc03aff046c..c38d22e5e902 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
| @@ -156,7 +156,7 @@ prefix##_get_next_variable (unsigned long *name_size, efi_char16_t *name, \ | |||
| 156 | #define STUB_SET_VARIABLE(prefix, adjust_arg) \ | 156 | #define STUB_SET_VARIABLE(prefix, adjust_arg) \ |
| 157 | static efi_status_t \ | 157 | static efi_status_t \ |
| 158 | prefix##_set_variable (efi_char16_t *name, efi_guid_t *vendor, \ | 158 | prefix##_set_variable (efi_char16_t *name, efi_guid_t *vendor, \ |
| 159 | unsigned long attr, unsigned long data_size, \ | 159 | u32 attr, unsigned long data_size, \ |
| 160 | void *data) \ | 160 | void *data) \ |
| 161 | { \ | 161 | { \ |
| 162 | struct ia64_fpreg fr[6]; \ | 162 | struct ia64_fpreg fr[6]; \ |