diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-24 15:55:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-24 15:55:28 +0100 |
| commit | a1fb6696c662920f695c97591d759391aca8a1ad (patch) | |
| tree | 25cc9ca4d1d291e122ff694dd41a9cc6d6513f60 /arch/arm/mach-realview/realview_pb11mp.c | |
| parent | 1f40a8bfa91adfa8d1ac5013c08c76f6fd6691ad (diff) | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | blackbird-op-linux-a1fb6696c662920f695c97591d759391aca8a1ad.tar.gz blackbird-op-linux-a1fb6696c662920f695c97591d759391aca8a1ad.zip | |
Merge tag 'v4.0-rc1' into x86/mm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-realview/realview_pb11mp.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index 47bf55fdbf27..15c45e25095f 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c @@ -262,7 +262,7 @@ static struct resource pmu_resources[] = { }; static struct platform_device pmu_device = { - .name = "arm-pmu", + .name = "armv6-pmu", .id = -1, .num_resources = ARRAY_SIZE(pmu_resources), .resource = pmu_resources, |
