From fa4a943c17e47bf910596a414fd7287983350b9b Mon Sep 17 00:00:00 2001
From: cvs2svn <cvs2svn@FreeBSD.org>
Date: Sun, 24 Feb 2008 03:11:57 +0000
Subject: This commit was manufactured by cvs2svn to create tag
 'RELEASE_7_0_0'.

---
 emulators/qemu/files/patch-vl.c-ppbus | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'emulators/qemu/files/patch-vl.c-ppbus')

diff --git a/emulators/qemu/files/patch-vl.c-ppbus b/emulators/qemu/files/patch-vl.c-ppbus
index d0b46abcbcb4..28cf485493d2 100644
--- a/emulators/qemu/files/patch-vl.c-ppbus
+++ b/emulators/qemu/files/patch-vl.c-ppbus
@@ -1,20 +1,21 @@
---- vl.c.orig	Mon Aug 21 23:06:11 2006
-+++ vl.c	Mon Aug 21 23:04:49 2006
-@@ -48,6 +48,8 @@
+Index: qemu/vl.c
+@@ -78,8 +78,10 @@
  #endif
  #ifdef __FreeBSD__
+ #include <sys/param.h>
  #include <sys/module.h>
+ #include <sys/linker.h>
 +#include <dev/ppbus/ppi.h>
 +#include <dev/ppbus/ppbconf.h>
  #endif
- #else
- #ifndef __sun__
+ 
+ #if defined(CONFIG_SLIRP)
 @@ -1728,7 +1730,64 @@
      chr->chr_ioctl = pp_ioctl;
      return chr;
  }
 -#endif /* defined(__linux__) */
-+#elif defined(__FreeBSD__)
++#if defined(__FreeBSD__)
 +static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
 +{
 +    int fd = (int)chr->opaque;
-- 
cgit v1.2.3