projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6]
/
drivers
/
usb
/
Kconfig
diff --git
a/drivers/usb/Kconfig
b/drivers/usb/Kconfig
index
b1222cd
..
7fdbc5d
100644
(file)
--- a/
drivers/usb/Kconfig
+++ b/
drivers/usb/Kconfig
@@
-87,8
+87,6
@@
source "drivers/usb/input/Kconfig"
source "drivers/usb/image/Kconfig"
-source "drivers/usb/media/Kconfig"
-
source "drivers/usb/net/Kconfig"
source "drivers/usb/mon/Kconfig"