summaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-09-16 07:09:02 +0200
committerDavid S. Miller <davem@davemloft.net>2011-09-16 07:09:02 +0200
commit52b9aca7ae8726d1fb41b97dd1d243d107fef11b (patch)
tree7acee111840bd25183513e9bde08e939ffd57be8 /drivers/firmware
parentpch_gbe: support ML7831 IOH (diff)
parente1000: Fix driver to be used on PA RISC C8000 workstations (diff)
downloadlinux-52b9aca7ae8726d1fb41b97dd1d243d107fef11b.tar.xz
linux-52b9aca7ae8726d1fb41b97dd1d243d107fef11b.zip
Merge branch 'master' of ../netdev/
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/google/gsmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
index 68810fd1a59d..aa83de9db1b9 100644
--- a/drivers/firmware/google/gsmi.c
+++ b/drivers/firmware/google/gsmi.c
@@ -420,7 +420,7 @@ static efi_status_t gsmi_get_next_variable(unsigned long *name_size,
static efi_status_t gsmi_set_variable(efi_char16_t *name,
efi_guid_t *vendor,
- unsigned long attr,
+ u32 attr,
unsigned long data_size,
void *data)
{