diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-05-05 16:54:33 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-05 16:54:33 +0200 |
| commit | 59991da498122f779434c4e0beac8a69e0322938 (patch) | |
| tree | 23e46bc7f355c6d65f3246f756cd8ef84cfc3030 /drivers/gpu/drm/bochs/bochs.h | |
| parent | ALSA: fm801: introduce fm801_ac97_is_ready()/fm801_ac97_is_valid() helpers (diff) | |
| parent | ALSA: hda - hdmi: Set converter channel count even without sink (diff) | |
| download | linux-59991da498122f779434c4e0beac8a69e0322938.tar.xz linux-59991da498122f779434c4e0beac8a69e0322938.zip | |
Merge branch 'for-linus' into for-next
... for applying the further HDMI fixes.
Diffstat (limited to 'drivers/gpu/drm/bochs/bochs.h')
| -rw-r--r-- | drivers/gpu/drm/bochs/bochs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h index 741965c001a6..7eb52dd44b01 100644 --- a/drivers/gpu/drm/bochs/bochs.h +++ b/drivers/gpu/drm/bochs/bochs.h @@ -1,5 +1,6 @@ #include <linux/io.h> #include <linux/fb.h> +#include <linux/console.h> #include <drm/drmP.h> #include <drm/drm_crtc.h> @@ -87,8 +88,6 @@ struct bochs_device { struct bochs_framebuffer gfb; struct drm_fb_helper helper; int size; - int x1, y1, x2, y2; /* dirty rect */ - spinlock_t dirty_lock; bool initialized; } fb; }; |