aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-28 12:40:45 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-28 12:40:45 -0400
commit7ca22cfa0f04917c6dc22b9587f6a6448a7b67d3 (patch)
tree1c44b4ced82a2f683b27f8759d27c70121ece445 /arch
parent7027df36e41836b11f01b0d30eee40c55df7d013 (diff)
USB: remove CONFIG_USB_DEBUG from defconfig files
Now that CONFIG_USB_DEBUG is gone, remove it from a number of defconfig files that were enabling it. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/badge4_defconfig1
-rw-r--r--arch/arm/configs/colibri_pxa300_defconfig1
-rw-r--r--arch/arm/configs/ep93xx_defconfig1
-rw-r--r--arch/arm/configs/footbridge_defconfig1
-rw-r--r--arch/arm/configs/keystone_defconfig1
-rw-r--r--arch/arm/configs/neponset_defconfig1
-rw-r--r--arch/arm/configs/omap1_defconfig1
-rw-r--r--arch/arm/configs/omap2plus_defconfig1
-rw-r--r--arch/arm/configs/raumfeld_defconfig1
-rw-r--r--arch/arm/configs/tct_hammer_defconfig1
-rw-r--r--arch/parisc/configs/c3000_defconfig1
-rw-r--r--arch/parisc/configs/generic-64bit_defconfig1
-rw-r--r--arch/powerpc/configs/44x/currituck_defconfig1
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig1
-rw-r--r--arch/sh/configs/apsh4ad0a_defconfig1
-rw-r--r--arch/sh/configs/rsk7264_defconfig1
-rw-r--r--arch/sh/configs/rsk7269_defconfig1
-rw-r--r--arch/sh/configs/sdk7780_defconfig1
-rw-r--r--arch/sh/configs/se7343_defconfig1
-rw-r--r--arch/x86/configs/i386_defconfig1
-rw-r--r--arch/x86/configs/x86_64_defconfig1
21 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/configs/badge4_defconfig b/arch/arm/configs/badge4_defconfig
index 60b0b9368b1b..0494c8f229a2 100644
--- a/arch/arm/configs/badge4_defconfig
+++ b/arch/arm/configs/badge4_defconfig
@@ -73,7 +73,6 @@ CONFIG_SA1100_WATCHDOG=m
73CONFIG_SOUND=y 73CONFIG_SOUND=y
74CONFIG_SOUND_PRIME=y 74CONFIG_SOUND_PRIME=y
75CONFIG_USB=y 75CONFIG_USB=y
76CONFIG_USB_DEBUG=y
77CONFIG_USB_MON=y 76CONFIG_USB_MON=y
78CONFIG_USB_ACM=m 77CONFIG_USB_ACM=m
79CONFIG_USB_PRINTER=m 78CONFIG_USB_PRINTER=m
diff --git a/arch/arm/configs/colibri_pxa300_defconfig b/arch/arm/configs/colibri_pxa300_defconfig
index 2641dd6ed2f5..be02fe2b14cb 100644
--- a/arch/arm/configs/colibri_pxa300_defconfig
+++ b/arch/arm/configs/colibri_pxa300_defconfig
@@ -47,7 +47,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
47CONFIG_LOGO=y 47CONFIG_LOGO=y
48# CONFIG_HID_SUPPORT is not set 48# CONFIG_HID_SUPPORT is not set
49CONFIG_USB=y 49CONFIG_USB=y
50CONFIG_USB_DEBUG=y
51CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 50CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
52CONFIG_USB_MON=y 51CONFIG_USB_MON=y
53CONFIG_USB_STORAGE=y 52CONFIG_USB_STORAGE=y
diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig
index 6ac5ea73bd0a..1b650c85bdd0 100644
--- a/arch/arm/configs/ep93xx_defconfig
+++ b/arch/arm/configs/ep93xx_defconfig
@@ -80,7 +80,6 @@ CONFIG_I2C_DEBUG_BUS=y
80CONFIG_WATCHDOG=y 80CONFIG_WATCHDOG=y
81CONFIG_EP93XX_WATCHDOG=y 81CONFIG_EP93XX_WATCHDOG=y
82CONFIG_USB=y 82CONFIG_USB=y
83CONFIG_USB_DEBUG=y
84CONFIG_USB_DYNAMIC_MINORS=y 83CONFIG_USB_DYNAMIC_MINORS=y
85CONFIG_USB_OHCI_HCD=y 84CONFIG_USB_OHCI_HCD=y
86CONFIG_USB_OHCI_HCD_PLATFORM=y 85CONFIG_USB_OHCI_HCD_PLATFORM=y
diff --git a/arch/arm/configs/footbridge_defconfig b/arch/arm/configs/footbridge_defconfig
index 17bb3f7b5802..87e020f303ab 100644
--- a/arch/arm/configs/footbridge_defconfig
+++ b/arch/arm/configs/footbridge_defconfig
@@ -100,7 +100,6 @@ CONFIG_FB_CYBER2000=y
100CONFIG_SOUND=m 100CONFIG_SOUND=m
101# CONFIG_USB_HID is not set 101# CONFIG_USB_HID is not set
102CONFIG_USB=m 102CONFIG_USB=m
103CONFIG_USB_DEBUG=y
104CONFIG_USB_MON=m 103CONFIG_USB_MON=m
105CONFIG_USB_PRINTER=m 104CONFIG_USB_PRINTER=m
106CONFIG_EXT2_FS=y 105CONFIG_EXT2_FS=y
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig
index ec9a41d50680..095bb52671f6 100644
--- a/arch/arm/configs/keystone_defconfig
+++ b/arch/arm/configs/keystone_defconfig
@@ -135,7 +135,6 @@ CONFIG_WATCHDOG=y
135CONFIG_WATCHDOG_CORE=y 135CONFIG_WATCHDOG_CORE=y
136CONFIG_DAVINCI_WATCHDOG=y 136CONFIG_DAVINCI_WATCHDOG=y
137CONFIG_USB=y 137CONFIG_USB=y
138CONFIG_USB_DEBUG=y
139CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 138CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
140CONFIG_USB_MON=y 139CONFIG_USB_MON=y
141CONFIG_USB_XHCI_HCD=y 140CONFIG_USB_XHCI_HCD=y
diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponset_defconfig
index 63aa319b44bb..460dca4a4f98 100644
--- a/arch/arm/configs/neponset_defconfig
+++ b/arch/arm/configs/neponset_defconfig
@@ -68,7 +68,6 @@ CONFIG_SOUND=y
68CONFIG_SOUND_PRIME=y 68CONFIG_SOUND_PRIME=y
69# CONFIG_USB_HID is not set 69# CONFIG_USB_HID is not set
70CONFIG_USB=m 70CONFIG_USB=m
71CONFIG_USB_DEBUG=y
72CONFIG_USB_MON=m 71CONFIG_USB_MON=m
73CONFIG_USB_OHCI_HCD=m 72CONFIG_USB_OHCI_HCD=m
74CONFIG_USB_STORAGE=m 73CONFIG_USB_STORAGE=m
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig
index 0f258d555fbc..ce541bb3c2de 100644
--- a/arch/arm/configs/omap1_defconfig
+++ b/arch/arm/configs/omap1_defconfig
@@ -197,7 +197,6 @@ CONFIG_SND_OMAP_SOC=y
197# CONFIG_USB_HID is not set 197# CONFIG_USB_HID is not set
198CONFIG_USB=y 198CONFIG_USB=y
199CONFIG_USB_PHY=y 199CONFIG_USB_PHY=y
200CONFIG_USB_DEBUG=y
201# CONFIG_USB_DEVICE_CLASS is not set 200# CONFIG_USB_DEVICE_CLASS is not set
202CONFIG_USB_MON=y 201CONFIG_USB_MON=y
203CONFIG_USB_OHCI_HCD=y 202CONFIG_USB_OHCI_HCD=y
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index a4e8d017f25b..b793a5362cf2 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -217,7 +217,6 @@ CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
217CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m 217CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
218CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m 218CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
219CONFIG_USB=y 219CONFIG_USB=y
220CONFIG_USB_DEBUG=y
221CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 220CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
222CONFIG_USB_MON=y 221CONFIG_USB_MON=y
223CONFIG_USB_WDM=y 222CONFIG_USB_WDM=y
diff --git a/arch/arm/configs/raumfeld_defconfig b/arch/arm/configs/raumfeld_defconfig
index f7caa909b40d..3d833aea545a 100644
--- a/arch/arm/configs/raumfeld_defconfig
+++ b/arch/arm/configs/raumfeld_defconfig
@@ -122,7 +122,6 @@ CONFIG_HID_TOPSEED=y
122CONFIG_HID_THRUSTMASTER=y 122CONFIG_HID_THRUSTMASTER=y
123CONFIG_HID_ZEROPLUS=y 123CONFIG_HID_ZEROPLUS=y
124CONFIG_USB=y 124CONFIG_USB=y
125CONFIG_USB_DEBUG=y
126CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 125CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
127CONFIG_USB_MON=y 126CONFIG_USB_MON=y
128CONFIG_USB_OHCI_HCD=y 127CONFIG_USB_OHCI_HCD=y
diff --git a/arch/arm/configs/tct_hammer_defconfig b/arch/arm/configs/tct_hammer_defconfig
index 71277a1591ba..7209a2caefcf 100644
--- a/arch/arm/configs/tct_hammer_defconfig
+++ b/arch/arm/configs/tct_hammer_defconfig
@@ -47,7 +47,6 @@ CONFIG_BLK_DEV_RAM_SIZE=10240
47# CONFIG_VGA_CONSOLE is not set 47# CONFIG_VGA_CONSOLE is not set
48# CONFIG_HID_SUPPORT is not set 48# CONFIG_HID_SUPPORT is not set
49CONFIG_USB=y 49CONFIG_USB=y
50CONFIG_USB_DEBUG=y
51# CONFIG_USB_DEVICE_CLASS is not set 50# CONFIG_USB_DEVICE_CLASS is not set
52CONFIG_USB_MON=y 51CONFIG_USB_MON=y
53CONFIG_USB_OHCI_HCD=y 52CONFIG_USB_OHCI_HCD=y
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig
index b2c3905682d9..fb92b8920785 100644
--- a/arch/parisc/configs/c3000_defconfig
+++ b/arch/parisc/configs/c3000_defconfig
@@ -127,7 +127,6 @@ CONFIG_SND_SEQUENCER_OSS=y
127CONFIG_SND_AD1889=y 127CONFIG_SND_AD1889=y
128CONFIG_USB_HIDDEV=y 128CONFIG_USB_HIDDEV=y
129CONFIG_USB=y 129CONFIG_USB=y
130CONFIG_USB_DEBUG=y
131CONFIG_USB_OHCI_HCD=y 130CONFIG_USB_OHCI_HCD=y
132CONFIG_USB_PRINTER=m 131CONFIG_USB_PRINTER=m
133CONFIG_USB_STORAGE=m 132CONFIG_USB_STORAGE=m
diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig
index 28c1b5de044e..dc0d7ce71ea7 100644
--- a/arch/parisc/configs/generic-64bit_defconfig
+++ b/arch/parisc/configs/generic-64bit_defconfig
@@ -219,7 +219,6 @@ CONFIG_HIDRAW=y
219CONFIG_HID_PID=y 219CONFIG_HID_PID=y
220CONFIG_USB_HIDDEV=y 220CONFIG_USB_HIDDEV=y
221CONFIG_USB=y 221CONFIG_USB=y
222CONFIG_USB_DEBUG=y
223CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 222CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
224CONFIG_USB_DYNAMIC_MINORS=y 223CONFIG_USB_DYNAMIC_MINORS=y
225CONFIG_USB_MON=m 224CONFIG_USB_MON=m
diff --git a/arch/powerpc/configs/44x/currituck_defconfig b/arch/powerpc/configs/44x/currituck_defconfig
index 4192322f8a7f..47de68261443 100644
--- a/arch/powerpc/configs/44x/currituck_defconfig
+++ b/arch/powerpc/configs/44x/currituck_defconfig
@@ -71,7 +71,6 @@ CONFIG_I2C_IBM_IIC=y
71# CONFIG_HWMON is not set 71# CONFIG_HWMON is not set
72CONFIG_THERMAL=y 72CONFIG_THERMAL=y
73CONFIG_USB=y 73CONFIG_USB=y
74CONFIG_USB_DEBUG=y
75CONFIG_USB_EHCI_HCD=y 74CONFIG_USB_EHCI_HCD=y
76CONFIG_USB_OHCI_HCD=y 75CONFIG_USB_OHCI_HCD=y
77CONFIG_RTC_CLASS=y 76CONFIG_RTC_CLASS=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index b21156372b24..c91066944842 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -964,7 +964,6 @@ CONFIG_HID_SAMSUNG=y
964CONFIG_HID_SONY=y 964CONFIG_HID_SONY=y
965CONFIG_HID_SUNPLUS=y 965CONFIG_HID_SUNPLUS=y
966CONFIG_USB=y 966CONFIG_USB=y
967CONFIG_USB_DEBUG=y
968CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 967CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
969# CONFIG_USB_DEVICE_CLASS is not set 968# CONFIG_USB_DEVICE_CLASS is not set
970CONFIG_USB_MON=y 969CONFIG_USB_MON=y
diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig
index 95ae23fcfdd6..ec70475da890 100644
--- a/arch/sh/configs/apsh4ad0a_defconfig
+++ b/arch/sh/configs/apsh4ad0a_defconfig
@@ -93,7 +93,6 @@ CONFIG_FONT_8x8=y
93CONFIG_FONT_8x16=y 93CONFIG_FONT_8x16=y
94CONFIG_LOGO=y 94CONFIG_LOGO=y
95CONFIG_USB=y 95CONFIG_USB=y
96CONFIG_USB_DEBUG=y
97CONFIG_USB_MON=y 96CONFIG_USB_MON=y
98CONFIG_USB_OHCI_HCD=y 97CONFIG_USB_OHCI_HCD=y
99CONFIG_USB_STORAGE=y 98CONFIG_USB_STORAGE=y
diff --git a/arch/sh/configs/rsk7264_defconfig b/arch/sh/configs/rsk7264_defconfig
index 1600426224c2..eecdf65bb789 100644
--- a/arch/sh/configs/rsk7264_defconfig
+++ b/arch/sh/configs/rsk7264_defconfig
@@ -60,7 +60,6 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=8
60CONFIG_SERIAL_SH_SCI_CONSOLE=y 60CONFIG_SERIAL_SH_SCI_CONSOLE=y
61# CONFIG_HWMON is not set 61# CONFIG_HWMON is not set
62CONFIG_USB=y 62CONFIG_USB=y
63CONFIG_USB_DEBUG=y
64CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 63CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
65# CONFIG_USB_DEVICE_CLASS is not set 64# CONFIG_USB_DEVICE_CLASS is not set
66CONFIG_USB_R8A66597_HCD=y 65CONFIG_USB_R8A66597_HCD=y
diff --git a/arch/sh/configs/rsk7269_defconfig b/arch/sh/configs/rsk7269_defconfig
index 9f062b5837d7..8370b10df357 100644
--- a/arch/sh/configs/rsk7269_defconfig
+++ b/arch/sh/configs/rsk7269_defconfig
@@ -43,7 +43,6 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=8
43CONFIG_SERIAL_SH_SCI_CONSOLE=y 43CONFIG_SERIAL_SH_SCI_CONSOLE=y
44# CONFIG_HWMON is not set 44# CONFIG_HWMON is not set
45CONFIG_USB=y 45CONFIG_USB=y
46CONFIG_USB_DEBUG=y
47CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 46CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
48# CONFIG_USB_DEVICE_CLASS is not set 47# CONFIG_USB_DEVICE_CLASS is not set
49CONFIG_USB_R8A66597_HCD=y 48CONFIG_USB_R8A66597_HCD=y
diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig
index fa37e897399b..6a96b9a2f7a5 100644
--- a/arch/sh/configs/sdk7780_defconfig
+++ b/arch/sh/configs/sdk7780_defconfig
@@ -100,7 +100,6 @@ CONFIG_HID_SAMSUNG=y
100CONFIG_HID_SONY=y 100CONFIG_HID_SONY=y
101CONFIG_HID_SUNPLUS=y 101CONFIG_HID_SUNPLUS=y
102CONFIG_USB=y 102CONFIG_USB=y
103CONFIG_USB_DEBUG=y
104# CONFIG_USB_DEVICE_CLASS is not set 103# CONFIG_USB_DEVICE_CLASS is not set
105CONFIG_USB_MON=y 104CONFIG_USB_MON=y
106CONFIG_USB_EHCI_HCD=y 105CONFIG_USB_EHCI_HCD=y
diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig
index af3fe7352471..201acb4652f7 100644
--- a/arch/sh/configs/se7343_defconfig
+++ b/arch/sh/configs/se7343_defconfig
@@ -92,7 +92,6 @@ CONFIG_HID_SAMSUNG=y
92CONFIG_HID_SONY=y 92CONFIG_HID_SONY=y
93CONFIG_HID_SUNPLUS=y 93CONFIG_HID_SUNPLUS=y
94CONFIG_USB=y 94CONFIG_USB=y
95CONFIG_USB_DEBUG=y
96CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 95CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
97CONFIG_USB_ISP116X_HCD=y 96CONFIG_USB_ISP116X_HCD=y
98CONFIG_UIO=y 97CONFIG_UIO=y
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index 619e7f7426c6..32d2e7056c87 100644
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@ -244,7 +244,6 @@ CONFIG_HID_TOPSEED=y
244CONFIG_HID_PID=y 244CONFIG_HID_PID=y
245CONFIG_USB_HIDDEV=y 245CONFIG_USB_HIDDEV=y
246CONFIG_USB=y 246CONFIG_USB=y
247CONFIG_USB_DEBUG=y
248CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 247CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
249CONFIG_USB_MON=y 248CONFIG_USB_MON=y
250CONFIG_USB_EHCI_HCD=y 249CONFIG_USB_EHCI_HCD=y
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index 6181c69b786b..a481dd4755d5 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -239,7 +239,6 @@ CONFIG_HID_TOPSEED=y
239CONFIG_HID_PID=y 239CONFIG_HID_PID=y
240CONFIG_USB_HIDDEV=y 240CONFIG_USB_HIDDEV=y
241CONFIG_USB=y 241CONFIG_USB=y
242CONFIG_USB_DEBUG=y
243CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 242CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
244CONFIG_USB_MON=y 243CONFIG_USB_MON=y
245CONFIG_USB_EHCI_HCD=y 244CONFIG_USB_EHCI_HCD=y