Update for 3.0 kernel