added arch/arm/mach-s40 and -godbox