Author: raskin
Date: Mon Aug  8 20:49:32 2011
New Revision: 28404
URL: https://svn.nixos.org/websvn/nix/?rev=28404&sc=1

Log:
Two options allegedely required for ath9k detection in Linux 3.0+. Without them 
nothing works, checked.

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
   nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix   Mon Aug  8 
19:55:14 2011        (r28403)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix   Mon Aug  8 
20:49:32 2011        (r28404)
@@ -56,6 +56,8 @@
       IPW2200_MONITOR y # support promiscuous mode
       HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP 
driver
       HOSTAP_FIRMWARE_NVRAM y
+      ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
+      ATH9K_AHB y # Ditto, AHB bus
 
       # Some settings to make sure that fbcondecor works - in particular,
       # disable tileblitting and the drivers that need it.

Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix   Mon Aug  8 
19:55:14 2011        (r28403)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix   Mon Aug  8 
20:49:32 2011        (r28404)
@@ -56,6 +56,8 @@
       IPW2200_MONITOR y # support promiscuous mode
       HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP 
driver
       HOSTAP_FIRMWARE_NVRAM y
+      ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
+      ATH9K_AHB y # Ditto, AHB bus
 
       # Some settings to make sure that fbcondecor works - in particular,
       # disable tileblitting and the drivers that need it.
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to