Update for 2.5.4 kernel