summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2011-05-09 15:26:16 +0000
committertaca <taca@pkgsrc.org>2011-05-09 15:26:16 +0000
commite2b7c8c354ba23917e5bebd88a006817e0556309 (patch)
tree0baa7e15d0c0c7f1cecb26150a13439ddce08b50
parent31b7fab1a52fb3d128bf386fb3c672cd98af55bc (diff)
downloadpkgsrc-e2b7c8c354ba23917e5bebd88a006817e0556309.tar.gz
Revert previous commit; I didn't noticed revision 1.8 of patches/patch-ac.
-rw-r--r--sysutils/libpciaccess/distinfo4
-rw-r--r--sysutils/libpciaccess/patches/patch-ac24
2 files changed, 14 insertions, 14 deletions
diff --git a/sysutils/libpciaccess/distinfo b/sysutils/libpciaccess/distinfo
index 45950a41edc..074d608192d 100644
--- a/sysutils/libpciaccess/distinfo
+++ b/sysutils/libpciaccess/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2011/05/09 14:06:46 taca Exp $
+$NetBSD: distinfo,v 1.13 2011/05/09 15:26:16 taca Exp $
SHA1 (libpciaccess-0.11.0.tar.bz2) = bcebba8b8441af151b59b63e8e91e66133b64158
RMD160 (libpciaccess-0.11.0.tar.bz2) = 7d579f024e543c97cceb47c204d395e4097becf2
Size (libpciaccess-0.11.0.tar.bz2) = 295639 bytes
SHA1 (patch-aa) = 6bb844c0696c8a86c6033605339e82da34164bdc
-SHA1 (patch-ac) = c25114198e5fe55bcef60020ec9e898000a7a4be
+SHA1 (patch-ac) = c2df07d306203f3236e3a79caf4eedc5104d6f78
diff --git a/sysutils/libpciaccess/patches/patch-ac b/sysutils/libpciaccess/patches/patch-ac
index 38c77c2272b..ce0eeb02fa2 100644
--- a/sysutils/libpciaccess/patches/patch-ac
+++ b/sysutils/libpciaccess/patches/patch-ac
@@ -1,4 +1,4 @@
- $NetBSD: patch-ac,v 1.9 2011/05/09 14:06:46 taca Exp $
+$NetBSD: patch-ac,v 1.10 2011/05/09 15:26:16 taca Exp $
--- src/netbsd_pci.c.orig 2009-02-17 00:10:20.000000000 +0000
+++ src/netbsd_pci.c
@@ -19,18 +19,18 @@
+#ifdef HAVE_MTRR
#include <machine/sysarch.h>
#include <machine/mtrr.h>
-
-+# ifdef _X86_SYSARCH_L
-+# define netbsd_set_mtrr(mr, num) _X86_SYSARCH_L(set_mtrr)(mr, num)
-+# else
-+# ifdef i386
-+# define netbsd_set_mtrr(mr, num) i386_set_mtrr((mr), (num))
-+# elif amd64
-+# define netbsd_set_mtrr(mr, num) x86_64_set_mtrr((mr), (num))
-+# endif
-+# endif
++#ifdef _X86_SYSARCH_L
++#define netbsd_set_mtrr(mr, num) _X86_SYSARCH_L(set_mtrr)((mr), (num))
++#else
++#ifdef __i386__
++#define netbsd_set_mtrr(mr, num) i386_set_mtrr((mr), (num))
+#endif
-+
++#ifdef __amd64__
++#define netbsd_set_mtrr(mr, num) x86_64_set_mtrr((mr), (num))
++#endif
++#endif
++#endif
+
+#include <dev/pci/pcidevs.h>
#include <dev/pci/pciio.h>
#include <dev/pci/pcireg.h>