I had a close look at the changelog and things like this have been happening (this is just the first one of intrest to the type of problem that Civil was hitting):commit b750a09385d7c464113ae8915e63541a163fbac8Author: Eric Miao <eric.y.miao@gmail.com>Date: Wed Jul 18 11:40:13 2007 +0100

[ARM] 4489/1: pxa: split pxa_cpu_suspend to processor specific ones

1. split pxa_cpu_suspend to pxa25x_cpu_suspend and pxa27x_cpu_suspend and make pxa25x_cpu_pm_enter() and pxa27x_cpu_pm_enter() to invoke the corresponding _suspend functions, thus remove all those ugly #ifdef .. #endif out of sleep.S

2. move the declarations of those suspend functions to pm.h

note: this is not a clean enough solution until all the pxa25x and pxa27x specific part is further removed out of sleep.S, sleep.S is supposed to contain generic code only

As I remember there was also cleanup on PM so the old patches need to be carefully adjusted by also looking at the functions used and even may require targeting different files if pxa specific code was moved out of the generic code.

Here is a specific chunk of the changelog concerning PM:[ARM] 4488/1: pxa: move pxa25x/pxa27x specific code out of pm.c