diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/exynos_drm.h | 5 | ||||
-rw-r--r-- | include/linux/vgaarb.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/drm/exynos_drm.h b/include/drm/exynos_drm.h index 3963116083ae..e478de4e5d56 100644 --- a/include/drm/exynos_drm.h +++ b/include/drm/exynos_drm.h | |||
@@ -85,7 +85,7 @@ struct drm_exynos_gem_mmap { | |||
85 | struct drm_exynos_vidi_connection { | 85 | struct drm_exynos_vidi_connection { |
86 | unsigned int connection; | 86 | unsigned int connection; |
87 | unsigned int extensions; | 87 | unsigned int extensions; |
88 | uint64_t *edid; | 88 | uint64_t edid; |
89 | }; | 89 | }; |
90 | 90 | ||
91 | struct drm_exynos_plane_set_zpos { | 91 | struct drm_exynos_plane_set_zpos { |
@@ -96,7 +96,8 @@ struct drm_exynos_plane_set_zpos { | |||
96 | /* memory type definitions. */ | 96 | /* memory type definitions. */ |
97 | enum e_drm_exynos_gem_mem_type { | 97 | enum e_drm_exynos_gem_mem_type { |
98 | /* Physically Non-Continuous memory. */ | 98 | /* Physically Non-Continuous memory. */ |
99 | EXYNOS_BO_NONCONTIG = 1 << 0 | 99 | EXYNOS_BO_NONCONTIG = 1 << 0, |
100 | EXYNOS_BO_MASK = EXYNOS_BO_NONCONTIG | ||
100 | }; | 101 | }; |
101 | 102 | ||
102 | #define DRM_EXYNOS_GEM_CREATE 0x00 | 103 | #define DRM_EXYNOS_GEM_CREATE 0x00 |
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index 9c3120dca294..b572f80bdfd5 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h | |||
@@ -47,6 +47,8 @@ | |||
47 | */ | 47 | */ |
48 | #define VGA_DEFAULT_DEVICE (NULL) | 48 | #define VGA_DEFAULT_DEVICE (NULL) |
49 | 49 | ||
50 | struct pci_dev; | ||
51 | |||
50 | /* For use by clients */ | 52 | /* For use by clients */ |
51 | 53 | ||
52 | /** | 54 | /** |