Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:02:35 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: dvo_ch7xxx.c
Log Message:
Add some consts to i915/dvo_ch7xxx.c for string literals.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
src/sys/external/bsd/drm2/dist/drm/i915/dvo_ch7xxx.c
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/dvo_ch7xxx.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/dvo_ch7xxx.c:1.1.1.1.2.2 src/sys/external/bsd/drm2/dist/drm/i915/dvo_ch7xxx.c:1.1.1.1.2.3
--- src/sys/external/bsd/drm2/dist/drm/i915/dvo_ch7xxx.c:1.1.1.1.2.2 Tue Jul 23 21:28:22 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/dvo_ch7xxx.c Wed Jul 24 03:02:35 2013
@@ -84,7 +84,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
static struct ch7xxx_id_struct {
uint8_t vid;
+#ifdef __NetBSD__
+ const char *name;
+#else
char *name;
+#endif
} ch7xxx_ids[] = {
{ CH7011_VID, "CH7011" },
{ CH7009A_VID, "CH7009A" },
@@ -96,7 +100,11 @@ struct ch7xxx_priv {
bool quiet;
};
+#ifdef __NetBSD__
+static const char *ch7xxx_get_id(uint8_t vid)
+#else
static char *ch7xxx_get_id(uint8_t vid)
+#endif
{
int i;
@@ -179,7 +187,11 @@ static bool ch7xxx_init(struct intel_dvo
/* this will detect the CH7xxx chip on the specified i2c bus */
struct ch7xxx_priv *ch7xxx;
uint8_t vendor, device;
+#ifdef __NetBSD__
+ const char *name;
+#else
char *name;
+#endif
ch7xxx = kzalloc(sizeof(struct ch7xxx_priv), GFP_KERNEL);
if (ch7xxx == NULL)
