diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-08-22 10:55:00 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-08-22 10:55:00 +0000 |
| commit | eb63b86c6d981ac610b6843e03a9c06a65b8db78 (patch) | |
| tree | 82e1ef1e01eb2c9824920c287d042c393c8fbb63 | |
| parent | f27856e3fafa93937d4d875b0fd183f22653bd6f (diff) | |
| download | nixlib-eb63b86c6d981ac610b6843e03a9c06a65b8db78.tar nixlib-eb63b86c6d981ac610b6843e03a9c06a65b8db78.tar.gz nixlib-eb63b86c6d981ac610b6843e03a9c06a65b8db78.tar.bz2 nixlib-eb63b86c6d981ac610b6843e03a9c06a65b8db78.tar.lz nixlib-eb63b86c6d981ac610b6843e03a9c06a65b8db78.tar.xz nixlib-eb63b86c6d981ac610b6843e03a9c06a65b8db78.tar.zst nixlib-eb63b86c6d981ac610b6843e03a9c06a65b8db78.zip | |
* Doh doh doh! Use the right config file for the 2.6.26 kernel.
svn path=/nixpkgs/trunk/; revision=12690
| -rw-r--r-- | pkgs/os-specific/linux/kernel/config-2.6.26-i686-smp | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/config-2.6.26-x86_64-smp | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-2.6.26.nix | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kernel/config-2.6.26-i686-smp b/pkgs/os-specific/linux/kernel/config-2.6.26-i686-smp index a1d9f8a83be8..6d5ecd4b1c82 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.26-i686-smp +++ b/pkgs/os-specific/linux/kernel/config-2.6.26-i686-smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.26.2 -# Thu Aug 7 16:21:47 2008 +# Linux kernel version: 2.6.26.3 +# Fri Aug 22 12:48:11 2008 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2383,6 +2383,7 @@ CONFIG_DEVPORT=y CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m +CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m diff --git a/pkgs/os-specific/linux/kernel/config-2.6.26-x86_64-smp b/pkgs/os-specific/linux/kernel/config-2.6.26-x86_64-smp index 837927ae4016..74e3e10f2ef4 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.26-x86_64-smp +++ b/pkgs/os-specific/linux/kernel/config-2.6.26-x86_64-smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.26.2 -# Thu Aug 7 16:33:17 2008 +# Linux kernel version: 2.6.26.3 +# Fri Aug 22 12:49:00 2008 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -2200,6 +2200,7 @@ CONFIG_DEVPORT=y CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m +CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.26.nix b/pkgs/os-specific/linux/kernel/linux-2.6.26.nix index 039936c977ca..7aff2b1e044f 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.26.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.26.nix @@ -61,9 +61,9 @@ stdenv.mkDerivation { config = if kernelConfig != null then kernelConfig else - if userModeLinux then ./config-2.6.25-uml else - if stdenv.system == "i686-linux" then ./config-2.6.25-i686-smp else - if stdenv.system == "x86_64-linux" then ./config-2.6.25-x86_64-smp else + if userModeLinux then ./config-2.6.26-uml else + if stdenv.system == "i686-linux" then ./config-2.6.26-i686-smp else + if stdenv.system == "x86_64-linux" then ./config-2.6.26-x86_64-smp else abort "No kernel configuration for your platform!"; buildInputs = [perl mktemp]; |