Module Name: src
Committed By: tnn
Date: Sat May 21 23:42:13 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_cache.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.10 src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.11
--- src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.10 Sun Dec 19 11:33:30 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h Sat May 21 23:42:13 2022
@@ -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 @@ static inline bool drm_arch_can_wc_memor
* optimization entirely for ARM and arm64.
*/
return false;
-#elif defined(CONFIG_ARM) || defined(CONFIG_ARM64)
- return false;
#else
return true;
#endif
