summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-28 16:37:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-28 16:37:35 -0800
commit8748dfae379573cdbea4e765b55e608a1764f918 (patch)
treed67f5c0ddd3a63481b14cd327779eeaf0bc165e9
parenta34815b96f9a21b3a2e2912dfd0d994acd2855e3 (diff)
parenteee628da2ee3cbba6f14696278c92a464239eea6 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: efivars: add missing parameter to efi_pstore_read()
-rw-r--r--drivers/firmware/efivars.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index a54a6b972ced..b0a81173a268 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -581,7 +581,8 @@ static int efi_pstore_close(struct pstore_info *psi)
}
static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type,
- struct timespec *time, struct pstore_info *psi)
+ struct timespec *timespec,
+ char **buf, struct pstore_info *psi)
{
return -1;
}