From 7921463456be3123f4f7169009ac276ccbd630e9 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 14 Mar 2010 16:18:57 +0000 Subject: fix typo --- debian/changelog | 2 +- debian/patches/40_iopl_mem.batch | 18 ------------------ debian/patches/40_iopl_mem.patch | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 debian/patches/40_iopl_mem.batch create mode 100644 debian/patches/40_iopl_mem.patch diff --git a/debian/changelog b/debian/changelog index 25b6d65..5a36b17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ gnumach (2:1.3.99.dfsg.git20091128-2) unreleased; urgency=low kernel-image, *-modules. - Remove duplicate priority and section fields. - Add ${misc:Depends}. - * debian/patches/40_iopl_mem.batch: Add patch, not enabled yet, to be used + * debian/patches/40_iopl_mem.patch: Add patch, not enabled yet, to be used instead of 40_iopl_mmap.patch when a new snapshot is taken. -- Guillem Jover Sat, 28 Nov 2009 19:14:15 +0100 diff --git a/debian/patches/40_iopl_mem.batch b/debian/patches/40_iopl_mem.batch deleted file mode 100644 index 5719a57..0000000 --- a/debian/patches/40_iopl_mem.batch +++ /dev/null @@ -1,18 +0,0 @@ -The mem device provides direct memory access (needed e.g. for Xorg), but some -packages (Xorg, notably) are still using the iopl device. - -diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c -index d51b5ee..88e753c 100644 ---- a/i386/i386at/conf.c -+++ b/i386/i386at/conf.c -@@ -135,6 +135,10 @@ struct dev_ops dev_name_list[] = - nodev, nodev, nodev, memmmap, - nodev, nulldev, nulldev, 0, - nodev }, -+ { "iopl", nulldev, nulldev, nodev, -+ nodev, nodev, nodev, memmmap, -+ nodev, nulldev, nulldev, 0, -+ nodev }, - #endif /* MACH_HYP */ - - #ifdef MACH_KMSG diff --git a/debian/patches/40_iopl_mem.patch b/debian/patches/40_iopl_mem.patch new file mode 100644 index 0000000..5719a57 --- /dev/null +++ b/debian/patches/40_iopl_mem.patch @@ -0,0 +1,18 @@ +The mem device provides direct memory access (needed e.g. for Xorg), but some +packages (Xorg, notably) are still using the iopl device. + +diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c +index d51b5ee..88e753c 100644 +--- a/i386/i386at/conf.c ++++ b/i386/i386at/conf.c +@@ -135,6 +135,10 @@ struct dev_ops dev_name_list[] = + nodev, nodev, nodev, memmmap, + nodev, nulldev, nulldev, 0, + nodev }, ++ { "iopl", nulldev, nulldev, nodev, ++ nodev, nodev, nodev, memmmap, ++ nodev, nulldev, nulldev, 0, ++ nodev }, + #endif /* MACH_HYP */ + + #ifdef MACH_KMSG -- cgit v1.2.3