Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/include/drm drm_cache.h: fix a me...



details:   https://anonhg.NetBSD.org/src/rev/4ffe19bf50e2
branches:  trunk
changeset: 366290:4ffe19bf50e2
user:      tnn <tnn%NetBSD.org@localhost>
date:      Sat May 21 23:42:13 2022 +0000

description:
drm_cache.h: fix a merge error

this reverts revision 1.3 which should have been reverted when it got
introduced by upstream through revision 1.5.

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drm_cache.h |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (18 lines):

diff -r 9465c5d4fe8a -r 4ffe19bf50e2 sys/external/bsd/drm2/dist/include/drm/drm_cache.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_cache.h        Sat May 21 23:11:03 2022 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_cache.h        Sat May 21 23:42:13 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_cache.h,v 1.10 2021/12/19 11:33:30 riastradh Exp $ */
+/*     $NetBSD: drm_cache.h,v 1.11 2022/05/21 23:42:13 tnn Exp $       */
 
 /**************************************************************************
  *
@@ -69,8 +69,6 @@
         * optimization entirely for ARM and arm64.
         */
        return false;
-#elif defined(CONFIG_ARM) || defined(CONFIG_ARM64)
-       return false;
 #else
        return true;
 #endif



Home | Main Index | Thread Index | Old Index