diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
| commit | 3fd04f71ad25d5df59c636986f741b9a36ce6501 (patch) | |
| tree | 995f4a15764d4196a92ecd966150e38d910d57d1 /recipes/linux/linux-omap-2.6.29 | |
| parent | b5b3d83a6f3b1c04a4ebe09f636683ef22495d09 (diff) | |
| parent | e426517ed76c7532434f0687f88fca1295530000 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/linux/linux-kirkwood_2.6.33-rc1.bb
Diffstat (limited to 'recipes/linux/linux-omap-2.6.29')
| -rw-r--r-- | recipes/linux/linux-omap-2.6.29/overo/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/linux/linux-omap-2.6.29/overo/defconfig b/recipes/linux/linux-omap-2.6.29/overo/defconfig index a4894e2283..06812f0ee9 100644 --- a/recipes/linux/linux-omap-2.6.29/overo/defconfig +++ b/recipes/linux/linux-omap-2.6.29/overo/defconfig @@ -1662,7 +1662,7 @@ CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m # CONFIG_USB_SERIAL_CYPRESS_M8 is not set # CONFIG_USB_SERIAL_EMPEG is not set CONFIG_USB_SERIAL_FTDI_SIO=m |