Wed Jul 24 03:09:42 2013 UTC ()
Use `static inline', not `extern inline', in i915_drv.h.


(riastradh)
diff -r1.1.1.1.2.8 -r1.1.1.1.2.9 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs diff -r1.1.1.1.2.8 -r1.1.1.1.2.9 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h 2013/07/24 03:09:26 1.1.1.1.2.8
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h 2013/07/24 03:09:42 1.1.1.1.2.9
@@ -1630,36 +1630,44 @@ extern int i915_save_state(struct drm_de @@ -1630,36 +1630,44 @@ extern int i915_save_state(struct drm_de
1630extern int i915_restore_state(struct drm_device *dev); 1630extern int i915_restore_state(struct drm_device *dev);
1631 1631
1632/* i915_suspend.c */ 1632/* i915_suspend.c */
1633extern int i915_save_state(struct drm_device *dev); 1633extern int i915_save_state(struct drm_device *dev);
1634extern int i915_restore_state(struct drm_device *dev); 1634extern int i915_restore_state(struct drm_device *dev);
1635 1635
1636/* i915_sysfs.c */ 1636/* i915_sysfs.c */
1637void i915_setup_sysfs(struct drm_device *dev_priv); 1637void i915_setup_sysfs(struct drm_device *dev_priv);
1638void i915_teardown_sysfs(struct drm_device *dev_priv); 1638void i915_teardown_sysfs(struct drm_device *dev_priv);
1639 1639
1640/* intel_i2c.c */ 1640/* intel_i2c.c */
1641extern int intel_setup_gmbus(struct drm_device *dev); 1641extern int intel_setup_gmbus(struct drm_device *dev);
1642extern void intel_teardown_gmbus(struct drm_device *dev); 1642extern void intel_teardown_gmbus(struct drm_device *dev);
 1643#ifdef __NetBSD__
 1644static inline bool intel_gmbus_is_port_valid(unsigned port)
 1645#else
1643extern inline bool intel_gmbus_is_port_valid(unsigned port) 1646extern inline bool intel_gmbus_is_port_valid(unsigned port)
 1647#endif
1644{ 1648{
1645 return (port >= GMBUS_PORT_SSC && port <= GMBUS_PORT_DPD); 1649 return (port >= GMBUS_PORT_SSC && port <= GMBUS_PORT_DPD);
1646} 1650}
1647 1651
1648extern struct i2c_adapter *intel_gmbus_get_adapter( 1652extern struct i2c_adapter *intel_gmbus_get_adapter(
1649 struct drm_i915_private *dev_priv, unsigned port); 1653 struct drm_i915_private *dev_priv, unsigned port);
1650extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed); 1654extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
1651extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit); 1655extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
 1656#ifdef __NetBSD__
 1657static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
 1658#else
1652extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) 1659extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
 1660#endif
1653{ 1661{
1654 return container_of(adapter, struct intel_gmbus, adapter)->force_bit; 1662 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
1655} 1663}
1656extern void intel_i2c_reset(struct drm_device *dev); 1664extern void intel_i2c_reset(struct drm_device *dev);
1657 1665
1658/* intel_opregion.c */ 1666/* intel_opregion.c */
1659extern int intel_opregion_setup(struct drm_device *dev); 1667extern int intel_opregion_setup(struct drm_device *dev);
1660#ifdef CONFIG_ACPI 1668#ifdef CONFIG_ACPI
1661extern void intel_opregion_init(struct drm_device *dev); 1669extern void intel_opregion_init(struct drm_device *dev);
1662extern void intel_opregion_fini(struct drm_device *dev); 1670extern void intel_opregion_fini(struct drm_device *dev);
1663extern void intel_opregion_asle_intr(struct drm_device *dev); 1671extern void intel_opregion_asle_intr(struct drm_device *dev);
1664extern void intel_opregion_gse_intr(struct drm_device *dev); 1672extern void intel_opregion_gse_intr(struct drm_device *dev);
1665extern void intel_opregion_enable_asle(struct drm_device *dev); 1673extern void intel_opregion_enable_asle(struct drm_device *dev);