git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for-2.6.35
[pandora-kernel.git]
/
Documentation
/
lguest
/
lguest.c
diff --git
a/Documentation/lguest/lguest.c
b/Documentation/lguest/lguest.c
index
4220851
..
e9ce3c5
100644
(file)
--- a/
Documentation/lguest/lguest.c
+++ b/
Documentation/lguest/lguest.c
@@
-34,7
+34,6
@@
#include <sys/uio.h>
#include <termios.h>
#include <getopt.h>
#include <sys/uio.h>
#include <termios.h>
#include <getopt.h>
-#include <zlib.h>
#include <assert.h>
#include <sched.h>
#include <limits.h>
#include <assert.h>
#include <sched.h>
#include <limits.h>
@@
-264,7
+263,7
@@
static u8 *get_feature_bits(struct device *dev)
* Launcher virtual with an offset.
*
* This can be tough to get your head around, but usually it just means that we
* Launcher virtual with an offset.
*
* This can be tough to get your head around, but usually it just means that we
- * use these trivial conversion functions when the Guest gives us it
'
s
+ * use these trivial conversion functions when the Guest gives us its
* "physical" addresses:
*/
static void *from_guest_phys(unsigned long addr)
* "physical" addresses:
*/
static void *from_guest_phys(unsigned long addr)