diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-24 22:11:17 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-24 22:11:17 -0700 |
| commit | 49327ad2bbbaf1945d5ba431522201574219d150 (patch) | |
| tree | 47beb374d0cfb77d401220f20e8cece4ce4469db /include/media | |
| parent | f9ce6eb5b6fa8cbcf0a0fb7c5f4203f94730fc52 (diff) | |
| parent | 6521d0bf984ab1cc25795d312e21c438aea8b5d5 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/rc-map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/rc-map.h b/include/media/rc-map.h index a9c041d49662..9b201ec8dc7f 100644 --- a/include/media/rc-map.h +++ b/include/media/rc-map.h @@ -35,7 +35,7 @@ struct ir_scancode_table { unsigned int len; /* Used number of entries */ unsigned int alloc; /* Size of *scan in bytes */ u64 ir_type; - char *name; + const char *name; spinlock_t lock; }; |