diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /target/linux/omap4/config-default | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'target/linux/omap4/config-default')
| -rw-r--r-- | target/linux/omap4/config-default | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/target/linux/omap4/config-default b/target/linux/omap4/config-default index bf503d861..b125c27fb 100644 --- a/target/linux/omap4/config-default +++ b/target/linux/omap4/config-default @@ -320,6 +320,7 @@ CONFIG_USB_COMMON=y # CONFIG_USB_DUMMY_HCD is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_OMAP=y +# CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_EHCI_TT_NEWSCHED=y # CONFIG_USB_ETH is not set # CONFIG_USB_FILE_STORAGE is not set @@ -343,6 +344,7 @@ CONFIG_USB_NET_SMSC95XX=y # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_OMAP3=y +# CONFIG_USB_OHCI_HCD_PLATFORM is not set CONFIG_USB_OMAP=y CONFIG_USB_OTG_UTILS=y # CONFIG_USB_R8A66597 is not set @@ -365,6 +367,8 @@ CONFIG_WL12XX_SDIO=m # CONFIG_WL12XX_SPI is not set CONFIG_XPS=y CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZONE_DMA_FLAG=0 |