diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab0fc4ccb61..1c6cd5847d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5572,6 +5572,7 @@ let ]; }; + # Please keep in sync with linux_3_0_powertop, except for extraConfig linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5583,6 +5584,31 @@ let ]; }; + # Please keep in sync with linux_3_0, except for extraConfig + linux_3_0_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + extraConfig = '' + CPU_FREQ_GOV_ONDEMAND y + CPU_FREQ_STAT y + DEBUG_KERNEL y + HIGH_RES_TIMERS y + HPET_TIMER y + NO_HZ y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + SND_AC97_POWER_SAVE y + TIMER_STATS y + USB_SUSPEND y + ''; + kernelPatches = + [ #kernelPatches.fbcondecor_2_6_38 + kernelPatches.sec_perm_2_6_24 + kernelPatches.aufs3_0 + #kernelPatches.aufs2_1_3_0 + #kernelPatches.mips_restart_2_6_36 + ]; + }; + linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5740,6 +5766,7 @@ let linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39); linuxPackages_2_6_39_powertop = recurseIntoAttrs (linuxPackagesFor linux_2_6_39_powertop pkgs.linuxPackages_2_6_39_powertop); linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); + linuxPackages_3_0_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_0_powertop pkgs.linuxPackages_3_0_powertop); linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34); linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);