From 90bbeac3ec623c980b643d864dd98879f8d65f8c Mon Sep 17 00:00:00 2001
From: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat, 4 Sep 2010 16:03:30 -0400
Subject: [PATCH] --- yaml --- r: 220670 b: refs/heads/master c:
 2e7a091833f014cac8a6b92573ca6cd2edd2753c h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/scripts/kconfig/expr.h  | 2 +-
 trunk/scripts/kconfig/lkc.h   | 2 +-
 trunk/scripts/kconfig/zconf.l | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 88c1c706ff8b..168b05c33bd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46
+refs/heads/master: 2e7a091833f014cac8a6b92573ca6cd2edd2753c
diff --git a/trunk/scripts/kconfig/expr.h b/trunk/scripts/kconfig/expr.h
index 6ee2e4fb1481..648c609caba0 100644
--- a/trunk/scripts/kconfig/expr.h
+++ b/trunk/scripts/kconfig/expr.h
@@ -18,7 +18,7 @@ extern "C" {
 struct file {
 	struct file *next;
 	struct file *parent;
-	char *name;
+	const char *name;
 	int lineno;
 	int flags;
 };
diff --git a/trunk/scripts/kconfig/lkc.h b/trunk/scripts/kconfig/lkc.h
index 5d5f1872d651..753cdbd7b805 100644
--- a/trunk/scripts/kconfig/lkc.h
+++ b/trunk/scripts/kconfig/lkc.h
@@ -76,7 +76,7 @@ FILE *zconf_fopen(const char *name);
 void zconf_initscan(const char *name);
 void zconf_nextfile(const char *name);
 int zconf_lineno(void);
-char *zconf_curname(void);
+const char *zconf_curname(void);
 
 /* conf.c */
 void xfgets(char *str, int size, FILE *in);
diff --git a/trunk/scripts/kconfig/zconf.l b/trunk/scripts/kconfig/zconf.l
index d8f7236cb0a3..2b0265082d0a 100644
--- a/trunk/scripts/kconfig/zconf.l
+++ b/trunk/scripts/kconfig/zconf.l
@@ -353,7 +353,7 @@ int zconf_lineno(void)
 	return current_pos.lineno;
 }
 
-char *zconf_curname(void)
+const char *zconf_curname(void)
 {
 	return current_pos.file ? current_pos.file->name : "<none>";
 }