Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:40:29 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_drv.h
src/sys/external/bsd/drm2/dist/include/drm [riastradh-drm2]: drm_crtc.h
Log Message:
Include <linux/acpi_io.h> for __acpi_iomem.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.13 -r1.1.1.1.2.14 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5 \
src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.13 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.14
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.13 Wed Jul 24 03:39:05 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Wed Jul 24 03:40:29 2013
@@ -146,7 +146,7 @@ struct opregion_asle;
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 @@ struct intel_opregion {
#define OPREGION_SIZE (8*1024)
#ifdef __NetBSD__ /* XXX acpi iomem */
-# undef __acpi_iomem
# undef __iomem
#endif
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.1.1.1.2.4 src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.1.1.1.2.5
--- src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.1.1.1.2.4 Wed Jul 24 02:19:30 2013
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h Wed Jul 24 03:40:29 2013
@@ -983,8 +983,13 @@ extern void drm_property_destroy(struct
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);
