diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-06 09:59:52 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-06 09:59:57 +0000 |
| commit | cee5ec43460351f0ce4617d3ffb34b74ad613a00 (patch) | |
| tree | 1c3fddcf3e7fbf086e857884113a748d9b9d17e7 /drivers/gpu/drm/gma500/framebuffer.h | |
| parent | 04b3924db60f974d2b4af0b2e19a0ae7ca202dc7 (diff) | |
| parent | 1b22edfd6efd02b6cb9cfe3389ed54731abb3a45 (diff) | |
drm: Merge branch 'drm-gma500-alancox' into drm-core-next
This merges a topic branch containing patches from Alan for the GMA500 driver.
* drm-gma500-alancox:
gma500: Oaktrail BIOS handling
gma500: Fix oaktrail probing part 1
gma500: Be smarter about layout
gma500: gtt based hardware scrolling console
gma500: frame buffer locking
gma500: Fix backlight crash
gma500: kill bogus code
gma500: Convert spaces to tabs in accel_2d.c.
gma500: do a pass over the FIXME tags
gma500: Add VBLANK support for Poulsbo hardware
gma500: Don't enable MSI on Poulsbo
gma500: Only register interrupt handler for poulsbo hardware
gma500: kill virtual mapping support
gma500: Move the API
gma500: kill off NUM_PIPE define
gma500: Rename the ioctls to avoid clashing with the legacy drivers
drm/gma500: begin pruning dead bits of API
Diffstat (limited to 'drivers/gpu/drm/gma500/framebuffer.h')
| -rw-r--r-- | drivers/gpu/drm/gma500/framebuffer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/framebuffer.h b/drivers/gpu/drm/gma500/framebuffer.h index d1b2289447f..989558a9e6e 100644 --- a/drivers/gpu/drm/gma500/framebuffer.h +++ b/drivers/gpu/drm/gma500/framebuffer.h @@ -32,7 +32,6 @@ struct psb_framebuffer { struct address_space *addr_space; struct fb_info *fbdev; struct gtt_range *gtt; - bool vm_map; /* True if we must undo a vm_map_ram */ }; struct psb_fbdev { |