diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-08 17:17:56 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-08 17:17:56 +0200 |
| commit | 8b6c5d8c8b9c8a35b806aaa9dee71d8125e39120 (patch) | |
| tree | 6e9c1d8fd14cd5cb71d48d4257e1c1a91fb2a569 /drivers/cpuidle | |
| parent | 19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0 (diff) | |
| parent | 4c834452aad01531db949414f94f817a86348d59 (diff) | |
| download | linux-8b6c5d8c8b9c8a35b806aaa9dee71d8125e39120.tar.gz | |
Merge tag 'v3.16-rc3' into spi-sh-msiof
Linux 3.16-rc3
Diffstat (limited to 'drivers/cpuidle')
| -rw-r--r-- | drivers/cpuidle/cpuidle-armada-370-xp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpuidle/cpuidle-armada-370-xp.c b/drivers/cpuidle/cpuidle-armada-370-xp.c index 28587d0f3947..a5fba0287bfb 100644 --- a/drivers/cpuidle/cpuidle-armada-370-xp.c +++ b/drivers/cpuidle/cpuidle-armada-370-xp.c @@ -55,7 +55,7 @@ static struct cpuidle_driver armada_370_xp_idle_driver = { .power_usage = 50, .target_residency = 100, .flags = CPUIDLE_FLAG_TIME_VALID, - .name = "MV CPU IDLE", + .name = "Idle", .desc = "CPU power down", }, .states[2] = { @@ -65,7 +65,7 @@ static struct cpuidle_driver armada_370_xp_idle_driver = { .target_residency = 1000, .flags = CPUIDLE_FLAG_TIME_VALID | ARMADA_370_XP_FLAG_DEEP_IDLE, - .name = "MV CPU DEEP IDLE", + .name = "Deep idle", .desc = "CPU and L2 Fabric power down", }, .state_count = ARMADA_370_XP_MAX_STATES, |