diff options
| author | Jesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com> | 2007-09-24 14:41:46 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com> | 2007-09-24 14:41:46 -0700 |
| commit | 5cc3083179b19678456905a9122a3d0f04e6f623 (patch) | |
| tree | 9b776bdd317aa5af68b7cbf8fabde12e20eccf8a /linux-core/intel_i2c.c | |
| parent | 2a2d02bbc500140a861380df52ce66abcac39312 (diff) | |
| parent | 54df1b9ff3b79097fedd8ed7bf54aca30a660cbd (diff) | |
Merge branch 'master' into modesetting-101 - TTM & typedef removal
Conflicts:
linux-core/drmP.h
linux-core/drm_bo.c
linux-core/drm_drv.c
linux-core/drm_objects.h
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Mostly removing typedefs that snuck into the modesetting code and
updating to the latest TTM APIs. As of today, the i915 driver builds,
but there are likely to be problems, so debugging and bugfixes will
come next.
Diffstat (limited to 'linux-core/intel_i2c.c')
| -rw-r--r-- | linux-core/intel_i2c.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linux-core/intel_i2c.c b/linux-core/intel_i2c.c index d4cf7eef..b512e592 100644 --- a/linux-core/intel_i2c.c +++ b/linux-core/intel_i2c.c @@ -46,7 +46,7 @@ static int get_clock(void *data) { struct intel_i2c_chan *chan = data; - drm_i915_private_t *dev_priv = chan->drm_dev->dev_private; + struct drm_i915_private *dev_priv = chan->drm_dev->dev_private; u32 val; val = I915_READ(chan->reg); @@ -56,7 +56,7 @@ static int get_clock(void *data) static int get_data(void *data) { struct intel_i2c_chan *chan = data; - drm_i915_private_t *dev_priv = chan->drm_dev->dev_private; + struct drm_i915_private *dev_priv = chan->drm_dev->dev_private; u32 val; val = I915_READ(chan->reg); @@ -66,8 +66,8 @@ static int get_data(void *data) static void set_clock(void *data, int state_high) { struct intel_i2c_chan *chan = data; - drm_device_t *dev = chan->drm_dev; - drm_i915_private_t *dev_priv = chan->drm_dev->dev_private; + struct drm_device *dev = chan->drm_dev; + struct drm_i915_private *dev_priv = chan->drm_dev->dev_private; u32 reserved = 0, clock_bits; /* On most chips, these bits must be preserved in software. */ @@ -87,8 +87,8 @@ static void set_clock(void *data, int state_high) static void set_data(void *data, int state_high) { struct intel_i2c_chan *chan = data; - drm_device_t *dev = chan->drm_dev; - drm_i915_private_t *dev_priv = chan->drm_dev->dev_private; + struct drm_device *dev = chan->drm_dev; + struct drm_i915_private *dev_priv = chan->drm_dev->dev_private; u32 reserved = 0, data_bits; /* On most chips, these bits must be preserved in software. */ @@ -127,7 +127,7 @@ static void set_data(void *data, int state_high) * %GPIOH * see PRM for details on how these different busses are used. */ -struct intel_i2c_chan *intel_i2c_create(drm_device_t *dev, const u32 reg, +struct intel_i2c_chan *intel_i2c_create(struct drm_device *dev, const u32 reg, const char *name) { struct intel_i2c_chan *chan; |