From 175fe5f6ad124db705c740904803f52d1c0beeb4 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 6 Dec 2009 20:25:12 +0000 Subject: [PATCH] debian/config/config: Always set USB_MDC800 and USB_MICROTEK. svn path=/dists/trunk/linux-2.6/; revision=14751 --- debian/config/alpha/config | 6 ------ debian/config/config | 6 ++++++ debian/config/hppa/config | 6 ------ debian/config/ia64/config | 6 ------ debian/config/kernelarch-x86/config | 6 ------ debian/config/mips/config.4kc-malta | 6 ------ debian/config/mips/config.5kc-malta | 6 ------ debian/config/mips/config.sb1-bcm91250a | 6 ------ debian/config/mips/config.sb1a-bcm91480b | 6 ------ debian/config/mipsel/config.r5k-cobalt | 6 ------ debian/config/powerpc/config | 6 ------ debian/config/sparc/config | 6 ------ 12 files changed, 6 insertions(+), 66 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 11031e501..9635d4fa5 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -969,12 +969,6 @@ CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m -## -## file: drivers/usb/image/Kconfig -## -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - ## ## file: drivers/usb/misc/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 4fb6cec0f..9f75a7122 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2247,6 +2247,12 @@ CONFIG_USB_R8A66597_HCD=m CONFIG_USB_WHCI_HCD=m CONFIG_USB_HWA_HCD=m +## +## file: drivers/usb/image/Kconfig +## +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + ## ## file: drivers/usb/misc/Kconfig ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 08f6e5caa..5c59ee8e7 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -517,12 +517,6 @@ CONFIG_USB_OHCI_HCD=m # CONFIG_USB_UHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set -## -## file: drivers/usb/image/Kconfig -## -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - ## ## file: drivers/usb/misc/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 12a1264de..9c1e2abf4 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -637,12 +637,6 @@ CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m -## -## file: drivers/usb/image/Kconfig -## -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - ## ## file: drivers/usb/misc/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 08b304df7..d39abb292 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1136,12 +1136,6 @@ CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m -## -## file: drivers/usb/image/Kconfig -## -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - ## ## file: drivers/usb/misc/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 1f1950f13..0396f7906 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1162,12 +1162,6 @@ CONFIG_USB_UHCI_HCD=y CONFIG_USB_U132_HCD=m CONFIG_USB_SL811_HCD=m -## -## file: drivers/usb/image/Kconfig -## -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - ## ## file: drivers/usb/misc/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 6165157d2..9e6c20614 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1384,12 +1384,6 @@ CONFIG_USB_UHCI_HCD=y CONFIG_USB_U132_HCD=m CONFIG_USB_SL811_HCD=m -## -## file: drivers/usb/image/Kconfig -## -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - ## ## file: drivers/usb/misc/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index b14c5fd80..862c5dd5c 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -636,12 +636,6 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m -## -## file: drivers/usb/image/Kconfig -## -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - ## ## file: drivers/usb/misc/Kconfig ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 2ec439291..d9aefe798 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -666,12 +666,6 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m -## -## file: drivers/usb/image/Kconfig -## -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - ## ## file: drivers/usb/misc/Kconfig ## diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 4694dfd6c..441b55a88 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -664,12 +664,6 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m -## -## file: drivers/usb/image/Kconfig -## -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - ## ## file: drivers/usb/misc/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 4427cc499..fa84bbf5b 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -745,12 +745,6 @@ CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m -## -## file: drivers/usb/image/Kconfig -## -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - ## ## file: drivers/usb/misc/Kconfig ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 7ec6c06ed..c62d82138 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -429,12 +429,6 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m # CONFIG_USB_SL811_HCD is not set -## -## file: drivers/usb/image/Kconfig -## -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - ## ## file: drivers/usb/misc/Kconfig ##