diff --git a/pkgs/os-specific/linux/kernel/config-2.6.29-i686-smp b/pkgs/os-specific/linux/kernel/config-2.6.29-i686-smp index 526b81fa872c..43431e7ea307 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.29-i686-smp +++ b/pkgs/os-specific/linux/kernel/config-2.6.29-i686-smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.29.4 -# Sat Jun 6 23:41:31 2009 +# Linux kernel version: 2.6.29.5 +# Wed Jun 17 14:19:54 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2193,7 +2193,7 @@ CONFIG_TOUCHSCREEN_USB_GOTOP=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=y +CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_APANEL=m CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT_ATLAS_BTNS=m diff --git a/pkgs/os-specific/linux/kernel/config-2.6.29-x86_64-smp b/pkgs/os-specific/linux/kernel/config-2.6.29-x86_64-smp index 323517c22fd1..a14568f63e4f 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.29-x86_64-smp +++ b/pkgs/os-specific/linux/kernel/config-2.6.29-x86_64-smp @@ -2057,7 +2057,7 @@ CONFIG_TOUCHSCREEN_USB_GOTOP=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=y +CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_APANEL=m CONFIG_INPUT_ATLAS_BTNS=m CONFIG_INPUT_ATI_REMOTE=m diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.29.nix b/pkgs/os-specific/linux/kernel/linux-2.6.29.nix index e02673662717..b77761ab5561 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.29.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.29.nix @@ -5,11 +5,11 @@ assert !userModeLinux; import ./generic.nix ( rec { - version = "2.6.29.4"; + version = "2.6.29.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1v6kpym0d0s2cwxpc3q6ja1sqyj9vn5cbpa1rkmr5vvi1y83yw24"; + sha256 = "1i8q37hg1iak15mryzzcb39pqgyxzhmgw368j28apd01qry21ag1"; }; features = {