Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[pandora-kernel.git] / arch / sh / kernel / cpu / shmobile / cpuidle.c

diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c
index c19e2a9..e4469e7 100644 (file)
--- a/arch/sh/kernel/cpu/shmobile/cpuidle.c
+++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c
@@ -75,7 +75,7 @@ void sh_mobile_setup_cpuidle(void)
        i = CPUIDLE_DRIVER_STATE_START;
 
        state = &dev->states[i++];
-       snprintf(state->name, CPUIDLE_NAME_LEN, "C0");
+       snprintf(state->name, CPUIDLE_NAME_LEN, "C1");
        strncpy(state->desc, "SuperH Sleep Mode", CPUIDLE_DESC_LEN);
        state->exit_latency = 1;
        state->target_residency = 1 * 2;
@@ -88,7 +88,7 @@ void sh_mobile_setup_cpuidle(void)
 
        if (sh_mobile_sleep_supported & SUSP_SH_SF) {
                state = &dev->states[i++];
-               snprintf(state->name, CPUIDLE_NAME_LEN, "C1");
+               snprintf(state->name, CPUIDLE_NAME_LEN, "C2");
                strncpy(state->desc, "SuperH Sleep Mode [SF]",
                        CPUIDLE_DESC_LEN);
                state->exit_latency = 100;
@@ -101,7 +101,7 @@ void sh_mobile_setup_cpuidle(void)
 
        if (sh_mobile_sleep_supported & SUSP_SH_STANDBY) {
                state = &dev->states[i++];
-               snprintf(state->name, CPUIDLE_NAME_LEN, "C2");
+               snprintf(state->name, CPUIDLE_NAME_LEN, "C3");
                strncpy(state->desc, "SuperH Mobile Standby Mode [SF]",
                        CPUIDLE_DESC_LEN);
                state->exit_latency = 2300;