Module Name: src
Committed By: dyoung
Date: Fri Jan 8 19:50:27 UTC 2010
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: i915_drv.c radeon_drv.c
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c \
src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.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/drm/dist/bsd-core/i915_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c:1.6 src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c:1.7
--- src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c:1.6 Sun Dec 6 22:51:25 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c Fri Jan 8 19:50:27 2010
@@ -163,7 +163,7 @@
#elif defined(__NetBSD__)
static bool
-i915drm_suspend(device_t self PMF_FN_ARGS)
+i915drm_suspend(device_t self, pmf_qual_t qual)
{
struct drm_device *dev = device_private(self);
@@ -172,7 +172,7 @@
}
static bool
-i915drm_resume(device_t self PMF_FN_ARGS)
+i915drm_resume(device_t self, pmf_qual_t qual)
{
struct drm_device *dev = device_private(self);
Index: src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.6 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.7
--- src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.6 Mon Dec 14 21:01:07 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c Fri Jan 8 19:50:27 2010
@@ -135,7 +135,7 @@
#elif defined(__NetBSD__)
static bool
-radeondrm_suspend(device_t self PMF_FN_ARGS)
+radeondrm_suspend(device_t self, pmf_qual_t qual)
{
struct drm_device *rad_dev = device_private(self);
drm_radeon_cp_stop_t stop_args;
@@ -148,7 +148,7 @@
}
static bool
-radeondrm_resume(device_t self PMF_FN_ARGS)
+radeondrm_resume(device_t self, pmf_qual_t qual)
{
struct drm_device *rad_dev = device_private(self);
if (radeon_cp_resume(rad_dev, NULL, NULL) != 0)