diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 09:18:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 09:18:39 +0200 |
| commit | f48d1915b86f06a943087e5f9b29542a1ef4cd4d (patch) | |
| tree | 86b5d8c7e971c684aa726faa20dbf415d3a742d5 | |
| parent | Merge branch 'tools-release' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | efivars: fix warnings when CONFIG_PSTORE=n (diff) | |
| download | linux-f48d1915b86f06a943087e5f9b29542a1ef4cd4d.tar.xz linux-f48d1915b86f06a943087e5f9b29542a1ef4cd4d.zip | |
Merge branch 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
efivars: fix warnings when CONFIG_PSTORE=n
| -rw-r--r-- | drivers/firmware/efivars.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index eacb05e6cfb3..eb80b549ed8d 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c @@ -157,7 +157,7 @@ utf16_strnlen(efi_char16_t *s, size_t maxlength) return length; } -static unsigned long +static inline unsigned long utf16_strlen(efi_char16_t *s) { return utf16_strnlen(s, ~0UL); @@ -580,8 +580,8 @@ static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type, return -1; } -static u64 efi_pstore_write(enum pstore_type_id type, int part, size_t size, - struct pstore_info *psi) +static u64 efi_pstore_write(enum pstore_type_id type, unsigned int part, + size_t size, struct pstore_info *psi) { return 0; } |