From 84eb2eadef1638b2646f2e9beb728381f4b5d0c7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 3 Dec 2009 07:08:51 +0000
Subject: [PATCH] Apply patch from Lluis needed for future ARM merge..

svn path=/nixpkgs/trunk/; revision=18776
---
 pkgs/os-specific/linux/kernel/linux-2.6.31.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 8be1f202332..006e2eda491 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