diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-04-06 10:16:55 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-10-17 09:48:06 -0600 |
| commit | 74d214bf8151e43c579db46863be8bd43577026e (patch) | |
| tree | 11136f87f89d09e309211623f39d53a8623b9a08 | |
| parent | f43a4181ce0573104eaa1adde4a4bf7aa45c2551 (diff) | |
UBUNTU: [Config] updateconfigs following rebase to v2.6.39-rc2
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 13015e6cea2..a07fd8f9bbf 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4355,7 +4355,6 @@ CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m # CONFIG_SERIAL_ICOM is not set # CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_JSM=m @@ -5329,6 +5328,7 @@ CONFIG_USB_USBNET=m CONFIG_USB_USS720=m CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_VL600=m CONFIG_USB_WDM=m CONFIG_USB_WHCI_HCD=m CONFIG_USB_WUSB=m |