diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/percpu.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/percpu.h')
| -rw-r--r-- | include/linux/percpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 2b9f82c037c9..cc88172c7d9a 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h | |||
| @@ -107,7 +107,7 @@ enum pcpu_fc { | |||
| 107 | 107 | ||
| 108 | PCPU_FC_NR, | 108 | PCPU_FC_NR, |
| 109 | }; | 109 | }; |
| 110 | extern const char *pcpu_fc_names[PCPU_FC_NR]; | 110 | extern const char * const pcpu_fc_names[PCPU_FC_NR]; |
| 111 | 111 | ||
| 112 | extern enum pcpu_fc pcpu_chosen_fc; | 112 | extern enum pcpu_fc pcpu_chosen_fc; |
| 113 | 113 | ||