Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:58:56 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: intel_pm.c
Log Message:
Ifdef out Linux intel_ips kludge in intel_pm.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.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/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.1.1.1.2.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.1.1.1.2.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.1.1.1.2.2 Tue Jul 23 21:28:22 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Wed Jul 24 02:58:56 2013
@@ -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 @@ EXPORT_SYMBOL_GPL(i915_gpu_turbo_disable
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 @@ ips_ping_for_i915_load(void)
link();
symbol_put(ips_link_to_i915_driver);
}
+#endif
}
void intel_gpu_ips_init(struct drm_i915_private *dev_priv)
