| commit | 484cdd87e2e7f480d8386c890edebe2d0630c46a | [log] [tgz] |
|---|---|---|
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | Tue Jun 26 15:40:18 2012 +0400 |
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | Tue Jun 26 15:40:18 2012 +0400 |
| tree | 4745ba6f295603ab2419ff316a2d2f2218d24426 | |
| parent | 9391b5fafd055f0b1c26a960999a1767b71844be [diff] |
Fix tilt-3.4 branch merge error tilt-3.4 branch merged the "cpuidle: add support for states that affect multiple cpus" commit by Colin Cross twice. The result is duplicate code in drivers/cpuidle/cpuidle.c and drivers/cpuidle/cpuidle.h, and build failure if CPU_IDLE is enabled. Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>