diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 16:35:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 16:35:09 +0200 |
| commit | 0c9e98af5e94877ad3b1af2c0f39b2376a462ded (patch) | |
| tree | acbab68f802fadbff85590c139c87dc199bb465d /drivers/gpu/drm/drm_crtc.c | |
| parent | staging: remove obsoleted CS5535/CS5536 GPIO driver (diff) | |
| parent | Linux 3.0-rc6 (diff) | |
| download | linux-0c9e98af5e94877ad3b1af2c0f39b2376a462ded.tar.xz linux-0c9e98af5e94877ad3b1af2c0f39b2376a462ded.zip | |
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/gpu/drm/drm_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 872747c5a544..21058e6ad2b8 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1113,7 +1113,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data, if (card_res->count_fbs >= fb_count) { copied = 0; fb_id = (uint32_t __user *)(unsigned long)card_res->fb_id_ptr; - list_for_each_entry(fb, &file_priv->fbs, head) { + list_for_each_entry(fb, &file_priv->fbs, filp_head) { if (put_user(fb->base.id, fb_id + copied)) { ret = -EFAULT; goto out; |