summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-10-17 16:21:31 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2011-10-17 16:21:31 +0200
commita9bc58b85327bf8cf5e3f63f75bebcb60e14901c (patch)
tree1a8fbc7a559fc48f550eb83f445b2cc6cbd5441f
parent701c3abc90d0cc32687555088171265cc372635a (diff)
downloadmeta-ti-a9bc58b85327bf8cf5e3f63f75bebcb60e14901c.tar.gz
linux-ti33x-psp 3.1rc8: sync defconfig with linux-am335x-joel recipe
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig9
1 files changed, 5 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig
index 5d419765..f3a0a9e0 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig
@@ -2521,8 +2521,8 @@ CONFIG_USB_STORAGE=y
2521# CONFIG_USB_STORAGE_KARMA is not set 2521# CONFIG_USB_STORAGE_KARMA is not set
2522# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 2522# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
2523# CONFIG_USB_STORAGE_ENE_UB6250 is not set 2523# CONFIG_USB_STORAGE_ENE_UB6250 is not set
2524# CONFIG_USB_UAS is not set 2524CONFIG_USB_UAS=y
2525# CONFIG_USB_LIBUSUAL is not set 2525CONFIG_USB_LIBUSUAL=y
2526 2526
2527# 2527#
2528# USB Imaging devices 2528# USB Imaging devices
@@ -2557,14 +2557,14 @@ CONFIG_USB_SISUSBVGA_CON=y
2557# CONFIG_USB_LD is not set 2557# CONFIG_USB_LD is not set
2558# CONFIG_USB_TRANCEVIBRATOR is not set 2558# CONFIG_USB_TRANCEVIBRATOR is not set
2559# CONFIG_USB_IOWARRIOR is not set 2559# CONFIG_USB_IOWARRIOR is not set
2560# CONFIG_USB_TEST is not set 2560CONFIG_USB_TEST=m
2561# CONFIG_USB_ISIGHTFW is not set 2561# CONFIG_USB_ISIGHTFW is not set
2562# CONFIG_USB_YUREX is not set 2562# CONFIG_USB_YUREX is not set
2563CONFIG_USB_GADGET=y 2563CONFIG_USB_GADGET=y
2564# CONFIG_USB_GADGET_DEBUG is not set 2564# CONFIG_USB_GADGET_DEBUG is not set
2565# CONFIG_USB_GADGET_DEBUG_FILES is not set 2565# CONFIG_USB_GADGET_DEBUG_FILES is not set
2566# CONFIG_USB_GADGET_DEBUG_FS is not set 2566# CONFIG_USB_GADGET_DEBUG_FS is not set
2567CONFIG_USB_GADGET_VBUS_DRAW=200 2567CONFIG_USB_GADGET_VBUS_DRAW=2
2568CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 2568CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
2569# CONFIG_USB_FUSB300 is not set 2569# CONFIG_USB_FUSB300 is not set
2570# CONFIG_USB_OMAP is not set 2570# CONFIG_USB_OMAP is not set
@@ -2586,6 +2586,7 @@ CONFIG_USB_FUNCTIONFS=m
2586CONFIG_USB_FUNCTIONFS_RNDIS=y 2586CONFIG_USB_FUNCTIONFS_RNDIS=y
2587# CONFIG_USB_FUNCTIONFS_GENERIC is not set 2587# CONFIG_USB_FUNCTIONFS_GENERIC is not set
2588CONFIG_USB_FILE_STORAGE=m 2588CONFIG_USB_FILE_STORAGE=m
2589# CONFIG_USB_FILE_STORAGE_TEST is not set
2589CONFIG_USB_MASS_STORAGE=m 2590CONFIG_USB_MASS_STORAGE=m
2590CONFIG_USB_G_SERIAL=m 2591CONFIG_USB_G_SERIAL=m
2591CONFIG_USB_MIDI_GADGET=m 2592CONFIG_USB_MIDI_GADGET=m