about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2009-12-03 07:08:51 +0000
committerMichael Raskin <7c6f434c@mail.ru>2009-12-03 07:08:51 +0000
commit84eb2eadef1638b2646f2e9beb728381f4b5d0c7 (patch)
tree371207ee6c017ee23e462d3d05008e6dcc5e00e5
parentaf84eef331a3e9352bbef5550be272d5053f3710 (diff)
Apply patch from Lluis needed for future ARM merge..
svn path=/nixpkgs/trunk/; revision=18776
-rw-r--r--pkgs/os-specific/linux/kernel/linux-2.6.31.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.31.nix b/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
index 8be1f20233272..006e2eda49140 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.31.nix
@@ -45,7 +45,9 @@ import ./generic.nix (
         killOption 'CONFIG_GCOV.*'
         killOption 'CONFIG_KGDB.*'
         killOption 'CONFIG_.*_TEST'
-        
+
+        killOption 'CONFIG_USB_OTG_BLACKLIST_HUB'
+
         killOption CONFIG_KERNEL_BZIP2
         killOption CONFIG_KERNEL_LZMA
         setOptionYes CONFIG_KERNEL_GZIP