Sync patches against current CVS from 2006-11-14.

1 files changed, 8 insertions, 8 deletions

diff --git a/debian/patches/46_io_device.patch b/debian/patches/46_io_device.patch
index 7772f7a..584a651 100644
--- a/debian/patches/46_io_device.patch
+++ b/debian/patches/46_io_device.patch
@@ -10,9 +10,9 @@
 
 Index: i386/i386/iopb.c
 ===================================================================
---- i386/i386/iopb.c.orig	2006-10-26 00:17:32.000000000 +0300
-+++ i386/i386/iopb.c	2006-10-26 00:17:37.000000000 +0300
-@@ -38,6 +38,7 @@
+--- i386/i386/iopb.c.orig	2006-11-14 04:16:29.000000000 +0200
++++ i386/i386/iopb.c	2006-11-14 04:21:48.000000000 +0200
+@@ -40,6 +40,7 @@
  #include <kern/thread.h>
  
  #include <device/dev_hdr.h>
@@ -20,7 +20,7 @@ Index: i386/i386/iopb.c
  
  #include "io_port.h"
  #include "iopb.h"
-@@ -82,6 +83,32 @@ typedef	struct io_use	*io_use_t;
+@@ -84,6 +85,32 @@ typedef	struct io_use	*io_use_t;
  decl_simple_lock_data(, iopb_lock)
  
  /*
@@ -53,7 +53,7 @@ Index: i386/i386/iopb.c
   * Initialize the package.
   */
  void
-@@ -130,9 +157,12 @@ io_bitmap_set(
+@@ -132,9 +159,12 @@ io_bitmap_set(
  {
  	io_reg_t	io_bit;
  
@@ -69,7 +69,7 @@ Index: i386/i386/iopb.c
  }
  
  /*
-@@ -145,9 +175,12 @@ io_bitmap_clear(
+@@ -147,9 +177,12 @@ io_bitmap_clear(
  {
  	io_reg_t	io_bit;
  
@@ -87,8 +87,8 @@ Index: i386/i386/iopb.c
  /*
 Index: i386/i386at/conf.c
 ===================================================================
---- i386/i386at/conf.c.orig	2006-10-26 00:16:49.000000000 +0300
-+++ i386/i386at/conf.c	2006-10-26 00:17:37.000000000 +0300
+--- i386/i386at/conf.c.orig	2006-10-15 20:39:23.000000000 +0300
++++ i386/i386at/conf.c	2006-11-14 04:21:48.000000000 +0200
 @@ -64,6 +64,9 @@ extern int	ioplopen(), ioplclose();
  extern vm_offset_t ioplmmap();
  #define	ioplname		"iopl"