diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-05 04:44:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-05 04:44:23 +0200 |
| commit | 8b6b4628126fd73d0a53b499a26133c15b73c1e6 (patch) | |
| tree | d5ae977face87faefbcd7487d118d99485107227 /arch | |
| parent | Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | efi: Fix argument types for SetVariable() for ia64 (diff) | |
| download | linux-8b6b4628126fd73d0a53b499a26133c15b73c1e6.tar.xz linux-8b6b4628126fd73d0a53b499a26133c15b73c1e6.zip | |
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, \ #define STUB_SET_VARIABLE(prefix, adjust_arg) \ static efi_status_t \ prefix##_set_variable (efi_char16_t *name, efi_guid_t *vendor, \ - unsigned long attr, unsigned long data_size, \ + u32 attr, unsigned long data_size, \ void *data) \ { \ struct ia64_fpreg fr[6]; \ |