diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-21 00:50:39 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-21 00:50:39 -0700 |
commit | e04997b13a2c2fc93af970fe95fd29a74db113e8 (patch) | |
tree | a84ec3368edc3c2568a0d6acdfa0d0e50d8cacf7 /drivers/gpu/drm/i915/intel_fb.c | |
parent | ipv6: Fix tcp_v6_send_response transport header setting. (diff) | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 (diff) | |
download | linux-dev-e04997b13a2c2fc93af970fe95fd29a74db113e8.tar.xz linux-dev-e04997b13a2c2fc93af970fe95fd29a74db113e8.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fb.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 69bbef92f130..8a0b3bcdc7b1 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c @@ -144,7 +144,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width, ret = -ENOMEM; goto out; } - obj_priv = fbo->driver_private; + obj_priv = to_intel_bo(fbo); mutex_lock(&dev->struct_mutex); |