[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist Include <linux/acpi_io.h...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a4e78f1d01a1
branches:  riastradh-drm2
changeset: 788409:a4e78f1d01a1
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:40:29 2013 +0000

description:
Include <linux/acpi_io.h> for __acpi_iomem.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    |  3 +--
 sys/external/bsd/drm2/dist/include/drm/drm_crtc.h |  5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r d409535ec2e1 -r a4e78f1d01a1 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Wed Jul 24 03:40:10 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Wed Jul 24 03:40:29 2013 +0000
@@ -146,7 +146,7 @@
 struct drm_i915_private;
 
 #ifdef __NetBSD__              /* XXX acpi iomem */
-#  define      __acpi_iomem
+#  include <linux/acpi_io.h>
 #  define      __iomem                 __acpi_iomem
 #endif
 
@@ -161,7 +161,6 @@
 #define OPREGION_SIZE            (8*1024)
 
 #ifdef __NetBSD__              /* XXX acpi iomem */
-#  undef       __acpi_iomem
 #  undef       __iomem
 #endif
 
diff -r d409535ec2e1 -r a4e78f1d01a1 sys/external/bsd/drm2/dist/include/drm/drm_crtc.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h Wed Jul 24 03:40:10 2013 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h Wed Jul 24 03:40:29 2013 +0000
@@ -983,8 +983,13 @@
 extern int drm_property_add_enum(struct drm_property *property, int index,
                                 uint64_t value, const char *name);
 extern int drm_mode_create_dvi_i_properties(struct drm_device *dev);
+#ifdef __NetBSD__              /* XXX const */
+extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats,
+                                    const char *formats[]);
+#else
 extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats,
                                     char *formats[]);
+#endif
 extern int drm_mode_create_scaling_mode_property(struct drm_device *dev);
 extern int drm_mode_create_dithering_property(struct drm_device *dev);
 extern int drm_mode_create_dirty_info_property(struct drm_device *dev);