Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:48:40 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_device.c
Log Message:
Ifdef out radeon vga in error branch.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c
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/drm/radeon/radeon_device.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.5 Mon Aug 27 07:44:12 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c Mon Aug 27 07:48:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_device.c,v 1.5 2018/08/27 07:44:12 riastradh Exp $ */
+/* $NetBSD: radeon_device.c,v 1.6 2018/08/27 07:48:40 riastradh Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.5 2018/08/27 07:44:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.6 2018/08/27 07:48:40 riastradh Exp $");
#include <linux/console.h>
#include <linux/slab.h>
@@ -1697,8 +1697,10 @@ int radeon_device_init(struct radeon_dev
return 0;
failed:
+#ifndef __NetBSD__ /* XXX radeon vga */
if (runtime)
vga_switcheroo_fini_domain_pm_ops(rdev->dev);
+#endif
return r;
}
