Module Name: src
Committed By: riastradh
Date: Wed Jul 24 04:00:35 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_drv.c
Log Message:
Stub out the content, not definition, of intel_console_resume.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.12 -r1.1.1.1.2.13 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_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/drm2/dist/drm/i915/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.1.1.1.2.12 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.1.1.1.2.13
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.1.1.1.2.12 Wed Jul 24 03:28:42 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Wed Jul 24 04:00:35 2013
@@ -562,9 +562,9 @@ int i915_suspend(struct drm_device *dev,
return 0;
}
-#ifndef __NetBSD__ /* XXX fb */
void intel_console_resume(struct work_struct *work)
{
+#ifndef __NetBSD__ /* XXX fb */
struct drm_i915_private *dev_priv =
container_of(work, struct drm_i915_private,
console_resume_work);
@@ -573,8 +573,8 @@ void intel_console_resume(struct work_st
console_lock();
intel_fbdev_set_suspend(dev, 0);
console_unlock();
-}
#endif
+}
static int __i915_drm_thaw(struct drm_device *dev)
{
