diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /scripts/kconfig/expr.h | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'scripts/kconfig/expr.h')
| -rw-r--r-- | scripts/kconfig/expr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 170459c224a1..184eb6a0b505 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h | |||
| @@ -18,7 +18,7 @@ extern "C" { | |||
| 18 | struct file { | 18 | struct file { |
| 19 | struct file *next; | 19 | struct file *next; |
| 20 | struct file *parent; | 20 | struct file *parent; |
| 21 | char *name; | 21 | const char *name; |
| 22 | int lineno; | 22 | int lineno; |
| 23 | int flags; | 23 | int flags; |
| 24 | }; | 24 | }; |
