summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Fredriksson <john.xj.fredriksson@stericsson.com>2011-10-14 17:50:06 +0200
committerJohn Fredriksson <john.xj.fredriksson@stericsson.com>2011-10-19 15:16:45 +0200
commite11e0db773284848e294a4732b31ccd0b474dadc (patch)
treef423dc09a80af8f09419f5d650a25a7199b17f60
parenta44668313217cfa67826d6241dab81ce6501ec25 (diff)
LINARO: Update packaging config file.
Update according to new u8500_defconfig.
-rw-r--r--debian.linaro/config/config.common.ubuntu17
1 files changed, 11 insertions, 6 deletions
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index e188dbb70bd..e8fe725948a 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -2013,7 +2013,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_CATC is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_USB_CDC_COMPOSITE=m
# CONFIG_USB_CDC_PHONET is not set
# CONFIG_USB_CYPRESS_CY7C63 is not set
# CONFIG_USB_CYTHERM is not set
@@ -2025,7 +2025,9 @@ CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_EMI62 is not set
# CONFIG_USB_ENESTORAGE is not set
-# CONFIG_USB_ETH is not set
+CONFIG_USB_ETH=m
+# CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_FILE_STORAGE is not set
# CONFIG_USB_FTDI_ELAN is not set
# CONFIG_USB_FUNCTIONFS is not set
@@ -2046,11 +2048,13 @@ CONFIG_USB_GADGET_VBUS_DRAW=500
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_USB_G_DBGP is not set
# CONFIG_USB_G_HID is not set
-# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_CDC=y
+# CONFIG_USB_G_MULTI_RNDIS is not set
# CONFIG_USB_G_NCM is not set
# CONFIG_USB_G_NOKIA is not set
# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_G_WEBCAM is not set
CONFIG_USB_HID=y
# CONFIG_USB_HIDDEV is not set
@@ -2070,7 +2074,7 @@ CONFIG_USB_HID=y
# CONFIG_USB_LED is not set
# CONFIG_USB_LEGOTOWER is not set
CONFIG_USB_LIBUSUAL=y
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set
# CONFIG_USB_MIDI_GADGET is not set
@@ -2126,7 +2130,8 @@ CONFIG_USB_UX500_DMA=y
# CONFIG_USB_WUSB is not set
# CONFIG_USB_WUSB_CBAF is not set
# CONFIG_USB_YUREX is not set
-# CONFIG_USB_ZERO is not set
+CONFIG_USB_ZERO=m
+# CONFIG_USB_ZERO_HNPTEST is not set
CONFIG_USE_GENERIC_SMP_HELPERS=y
# CONFIG_USE_OF is not set
CONFIG_UX500_CONSOLE_UART_GPIO_PIN=29