From 324fccd33c1ec792ffa24817d49bac3742edce2d Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Wed, 21 Jan 2009 22:16:09 +0000
Subject: [PATCH] - moved include statement to reduce dependencies - updated
 FSF address

---
 bochs/iodev/svga_cirrus.cc | 5 +++--
 bochs/iodev/vga.h          | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bochs/iodev/svga_cirrus.cc b/bochs/iodev/svga_cirrus.cc
index 143641785..c4edb5c77 100644
--- a/bochs/iodev/svga_cirrus.cc
+++ b/bochs/iodev/svga_cirrus.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: svga_cirrus.cc,v 1.46 2008-12-29 20:16:08 sshwarts Exp $
+// $Id: svga_cirrus.cc,v 1.47 2009-01-21 22:16:09 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 // Copyright (c) 2004 Makoto Suzuki (suzu)
@@ -18,7 +18,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 /////////////////////////////////////////////////////////////////////////
 
@@ -38,6 +38,7 @@
 
 #include "iodev.h"
 #include "vga.h"
+#include "svga_cirrus.h"
 
 #if BX_SUPPORT_CLGD54XX
 
diff --git a/bochs/iodev/vga.h b/bochs/iodev/vga.h
index fe59f3d17..ae8ab806d 100644
--- a/bochs/iodev/vga.h
+++ b/bochs/iodev/vga.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: vga.h,v 1.64 2009-01-19 13:13:32 vruppert Exp $
+// $Id: vga.h,v 1.65 2009-01-21 22:16:09 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -334,7 +334,6 @@ protected:
 
 #if BX_SUPPORT_CLGD54XX
 void libvga_set_smf_pointer(bx_vga_c *theVga_ptr);
-#include "iodev/svga_cirrus.h"
 #endif
 
 #endif