linux3.17: enable some forgotten/renamed modules.
linux3.18: enable some forgotten/renamed modules.