Wed Jul 24 02:58:56 2013 UTC ()
Ifdef out Linux intel_ips kludge in intel_pm.c.


(riastradh)
diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c

cvs diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c (expand / switch to context diff)
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c 2013/07/23 21:28:22 1.1.1.1.2.2
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c 2013/07/24 02:58:56 1.1.1.1.2.3
@@ -28,7 +28,9 @@
 #include <linux/cpufreq.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
+#ifndef __NetBSD__
 #include "../../../platform/x86/intel_ips.h"
+#endif
 #include <linux/module.h>
 
 #define FORCEWAKE_ACK_TIMEOUT_MS 2
@@ -3334,6 +3336,7 @@
 static void
 ips_ping_for_i915_load(void)
 {
+#ifndef __NetBSD__		/* XXX whattakludge for Linux module mania */
 	void (*link)(void);
 
 	link = symbol_get(ips_link_to_i915_driver);
@@ -3341,6 +3344,7 @@
 		link();
 		symbol_put(ips_link_to_i915_driver);
 	}
+#endif
 }
 
 void intel_gpu_ips_init(struct drm_i915_private *dev_priv)