Merge to new upstream release 3.0

1 files changed, 3 insertions, 2 deletions

diff --git a/util.h b/util.h
index d4c3196..9d409cd 100644
--- a/util.h
+++ b/util.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the dmidecode project.
  *
- *   Copyright (C) 2003-2010 Jean Delvare <khali@linux-fr.org>
+ *   Copyright (C) 2003-2015 Jean Delvare <jdelvare@suse.de>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 
 int checksum(const u8 *buf, size_t len);
-void *mem_chunk(size_t base, size_t len, const char *devmem);
+void *read_file(size_t len, const char *filename);
+void *mem_chunk(off_t base, size_t len, const char *devmem);
 int write_dump(size_t base, size_t len, const void *data, const char *dumpfile, int add);
 u64 u64_range(u64 start, u64 end);