diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-20 15:26:04 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-20 15:26:04 -0400 |
commit | f0b433e9f362e0b7f0ce7d1489dd7feba068605d (patch) | |
tree | d4bfd9489cf4a96a55d83af20919f477a846d585 /include/drm/drm_crtc.h | |
parent | fa2f5bf09610d3c216d4c74855edbe00d636467c (diff) | |
parent | 28c42c28309244d0b15d1b385e33429d59997679 (diff) |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Additional updates for 3.6
A batch more bugfixes, all driver-specific and fairly small and
unremarkable in a global context. The biggest batch are for the newly
added Arizona drivers.
Diffstat (limited to 'include/drm/drm_crtc.h')
-rw-r--r-- | include/drm/drm_crtc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index bac55c215113..a1a0386e0160 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
@@ -676,8 +676,6 @@ struct drm_plane { | |||
676 | * This is used to set modes. | 676 | * This is used to set modes. |
677 | */ | 677 | */ |
678 | struct drm_mode_set { | 678 | struct drm_mode_set { |
679 | struct list_head head; | ||
680 | |||
681 | struct drm_framebuffer *fb; | 679 | struct drm_framebuffer *fb; |
682 | struct drm_crtc *crtc; | 680 | struct drm_crtc *crtc; |
683 | struct drm_display_mode *mode; | 681 | struct drm_display_mode *mode; |