Merge branch 'drm/shmob' of git://linuxtv.org/pinchartl/fbdev into drm-next

Browse source

Fixes for shmob + prime support

* 'drm/shmob' of git://linuxtv.org/pinchartl/fbdev:
  drm/shmobile: Enable compilation on all ARM platforms
  drm/shmobile: Add DRM PRIME support
  drm/shmobile: Use devm_* managed functions
  drm/shmobile: Minor typo fix in debug message

...

This commit is contained in:

Dave Airlie 2013-06-27 18:40:23 +10:00

parent 4bf8e1962f 227c1fb28c

commit 2b54f78190

4 changed files with 18 additions and 28 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpu/drm/shmobile/Kconfig

View file

35

drivers/gpu/drm/shmobile/shmob_drm_drv.c

View file

2

drivers/gpu/drm/shmobile/shmob_drm_kms.c

View file

7

drivers/gpu/drm/shmobile/shmob_drm_plane.c

View file