Patch from Ian Campbell

Rediffed against latest BK. Compiles on Assabet and my PXA255 

platform. Tested on my 255 platform.