summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-04 16:44:23 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-04 16:44:23 -1000
commit8b6b4628126fd73d0a53b499a26133c15b73c1e6 (patch)
treed5ae977face87faefbcd7487d118d99485107227
parentf03683b8fb7e03862d2f1366a16c1b01732a5741 (diff)
parent1eb9a4b8a3c8a141cf2ab27309f089923b69c707 (diff)
downloadblackbird-op-linux-8b6b4628126fd73d0a53b499a26133c15b73c1e6.tar.gz
blackbird-op-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
-rw-r--r--arch/ia64/kernel/efi.c2
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]; \
OpenPOWER on IntegriCloud