svn commit: r194724 - in stable/7/sys: . contrib/pf dev/drm

[Robert Noland]

Author: rnoland
Date: Tue Jun 23 15:53:17 2009
New Revision: 194724
URL: http://svn.freebsd.org/changeset/base/194724

Log:
  Merge 190166 from HEAD
  
  Remove the DRM_ERROR to fix build.  It didn't make any sense anyway.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/drm/i915_drv.c

Modified: stable/7/sys/dev/drm/i915_drv.c
==============================================================================
--- stable/7/sys/dev/drm/i915_drv.c	Tue Jun 23 15:52:08 2009	(r194723)
+++ stable/7/sys/dev/drm/i915_drv.c	Tue Jun 23 15:53:17 2009	(r194724)
@@ -48,8 +48,6 @@ static int i915_suspend(device_t kdev)
 	struct drm_device *dev = device_get_softc(kdev);
 
 	if (!dev || !dev->dev_private) {
-		DRM_ERROR("dev: 0x%lx, dev_priv: 0x%lx\n",
-			(unsigned long) dev, (unsigned long) dev_priv);
 		DRM_ERROR("DRM not initialized, aborting suspend.\n");
 		return -ENODEV;
 	}