diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-30 14:28:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-30 14:28:11 -0800 |
| commit | 2309d0768237476c3144aa296264ad9e19598461 (patch) | |
| tree | 54a411097585f134eeacc2ff3c135dd2ce460b5d /arch/nds32/kernel | |
| parent | Merge tag 'notifications-pipe-prep-20191115' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs (diff) | |
| parent | MAINTAINERS: add nds32 maintainer (diff) | |
| download | wireguard-linux-2309d0768237476c3144aa296264ad9e19598461.tar.xz wireguard-linux-2309d0768237476c3144aa296264ad9e19598461.zip | |
Merge tag 'nds32-for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux
Pull nds32 updates from Greentime Hu:
- code clean up
- add a nds32 maintainer
* tag 'nds32-for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux:
MAINTAINERS: add nds32 maintainer
nds32: Move static keyword to the front of declaration
nds32: Fix typo in Kconfig.cpu
nds32: remove unneeded clean-files for DTB
Diffstat (limited to 'arch/nds32/kernel')
| -rw-r--r-- | arch/nds32/kernel/perf_event_cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nds32/kernel/perf_event_cpu.c b/arch/nds32/kernel/perf_event_cpu.c index 334c2a6cec23..0ce6f9f307e6 100644 --- a/arch/nds32/kernel/perf_event_cpu.c +++ b/arch/nds32/kernel/perf_event_cpu.c @@ -1119,7 +1119,7 @@ static void cpu_pmu_init(struct nds32_pmu *cpu_pmu) on_each_cpu(cpu_pmu->reset, cpu_pmu, 1); } -const static struct of_device_id cpu_pmu_of_device_ids[] = { +static const struct of_device_id cpu_pmu_of_device_ids[] = { {.compatible = "andestech,nds32v3-pmu", .data = device_pmu_init}, {}, |