diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 21:35:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 21:35:09 -0400 |
| commit | f2347dfcd14fd9e30714656cb27be2b7abe59c63 (patch) | |
| tree | 4a335d5ee0ac4ca9b394986d778734bdb04256e9 /Documentation | |
| parent | 74c75f524ec5a48a00a8f01864a754c1d0e4a44b (diff) | |
| parent | 526e5ab200ce483dcdf146806f4936bd58daa800 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
lguest: fix irq vectors.
lguest: fix early_ioremap.
lguest: fix example launcher compile after moved asm-x86 dir.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/lguest/Makefile | 2 | ||||
| -rw-r--r-- | Documentation/lguest/lguest.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/lguest/Makefile b/Documentation/lguest/Makefile index bac037eb1cda..725eef81cd48 100644 --- a/Documentation/lguest/Makefile +++ b/Documentation/lguest/Makefile | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # This creates the demonstration utility "lguest" which runs a Linux guest. | 1 | # This creates the demonstration utility "lguest" which runs a Linux guest. |
| 2 | CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include | 2 | CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include |
| 3 | LDLIBS:=-lz | 3 | LDLIBS:=-lz |
| 4 | 4 | ||
| 5 | all: lguest | 5 | all: lguest |
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c index da86fd53856a..804520633fcf 100644 --- a/Documentation/lguest/lguest.c +++ b/Documentation/lguest/lguest.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | #include "linux/virtio_console.h" | 44 | #include "linux/virtio_console.h" |
| 45 | #include "linux/virtio_rng.h" | 45 | #include "linux/virtio_rng.h" |
| 46 | #include "linux/virtio_ring.h" | 46 | #include "linux/virtio_ring.h" |
| 47 | #include "asm-x86/bootparam.h" | 47 | #include "asm/bootparam.h" |
| 48 | /*L:110 We can ignore the 39 include files we need for this program, but I do | 48 | /*L:110 We can ignore the 39 include files we need for this program, but I do |
| 49 | * want to draw attention to the use of kernel-style types. | 49 | * want to draw attention to the use of kernel-style types. |
| 50 | * | 50 | * |