Merge "defconfig: enabling usbmon and kinetic support" into odroidc-3.10.y

This commit is contained in:
Mauro Ribeiro
2014-12-31 11:55:52 +09:00
committed by Gerrit Code Review

View File

@@ -2574,7 +2574,7 @@ CONFIG_USB_GSPCA=m
# CONFIG_USB_GSPCA_FINEPIX is not set
# CONFIG_USB_GSPCA_JEILINJ is not set
# CONFIG_USB_GSPCA_JL2005BCD is not set
# CONFIG_USB_GSPCA_KINECT is not set
CONFIG_USB_GSPCA_KINECT=m
# CONFIG_USB_GSPCA_KONICA is not set
# CONFIG_USB_GSPCA_MARS is not set
# CONFIG_USB_GSPCA_MR97310A is not set
@@ -3158,7 +3158,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
# CONFIG_USB_MON is not set
CONFIG_USB_MON=m
# CONFIG_USB_WUSB_CBAF is not set
#