diff options
| author | Peter Simons <simons@cryp.to> | 2013-02-24 19:27:08 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-02-24 19:27:08 +0100 |
| commit | 5f32207dfc9a146f426ba168bfcf887292f2d265 (patch) | |
| tree | 0a217c941f7fa5be04431e98773971aab2ea092e /pkgs/os-specific/linux/kernel | |
| parent | f20ff74afe62857376f1e3a081944500cca4e3ce (diff) | |
| parent | 7d5056f8a3cf76b20d9b24e6644f2fc7fdf4a0f8 (diff) | |
| download | nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar.gz nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar.bz2 nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar.lz nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar.xz nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.tar.zst nixlib-5f32207dfc9a146f426ba168bfcf887292f2d265.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.7.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.8.nix | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index eecf52b1ddfe..fad84e180bd3 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -134,7 +134,6 @@ stdenv.mkDerivation { homepage = http://www.kernel.org/; maintainers = [ lib.maintainers.eelco - lib.maintainers.shlevy lib.maintainers.chaoflow ]; platforms = lib.platforms.linux; diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 9c96c2a8fd26..df6387b1f812 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -78,6 +78,7 @@ let ATH9K_AHB y # Ditto, AHB bus B43_PHY_HT y BCMA_HOST_PCI y + CFG80211_WEXT y # Without it, ipw2200 drivers don't build # Some settings to make sure that fbcondecor works - in particular, # disable tileblitting and the drivers that need it. diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index 58e6f28453a1..1c59a2ff4862 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -78,6 +78,7 @@ let ATH9K_AHB y # Ditto, AHB bus B43_PHY_HT y BCMA_HOST_PCI y + CFG80211_WEXT y # Without it, ipw2200 drivers don't build # Some settings to make sure that fbcondecor works - in particular, # disable tileblitting and the drivers that need it. |