Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:09:42 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_drv.h
Log Message:
Use `static inline', not `extern inline', in i915_drv.h.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.8 -r1.1.1.1.2.9 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
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.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.8 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.9
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.8 Wed Jul 24 03:09:26 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Wed Jul 24 03:09:42 2013
@@ -1640,7 +1640,11 @@ void i915_teardown_sysfs(struct drm_devi
/* intel_i2c.c */
extern int intel_setup_gmbus(struct drm_device *dev);
extern void intel_teardown_gmbus(struct drm_device *dev);
+#ifdef __NetBSD__
+static inline bool intel_gmbus_is_port_valid(unsigned port)
+#else
extern inline bool intel_gmbus_is_port_valid(unsigned port)
+#endif
{
return (port >= GMBUS_PORT_SSC && port <= GMBUS_PORT_DPD);
}
@@ -1649,7 +1653,11 @@ extern struct i2c_adapter *intel_gmbus_g
struct drm_i915_private *dev_priv, unsigned port);
extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
+#ifdef __NetBSD__
+static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
+#else
extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
+#endif
{
return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
}
