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/mcs814x/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/mcs814x/config-default')
| -rw-r--r-- | target/linux/mcs814x/config-default | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mcs814x/config-default b/target/linux/mcs814x/config-default index 5011107fe..00c6b6ccb 100644 --- a/target/linux/mcs814x/config-default +++ b/target/linux/mcs814x/config-default @@ -60,7 +60,6 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_IRQ_CHIP=y CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GPIOLIB=y CONFIG_GPIO_MCS814X=y CONFIG_GPIO_SYSFS=y @@ -118,7 +117,6 @@ CONFIG_MCS814X_PHY=y # CONFIG_MCS814X_WATCHDOG is not set CONFIG_MDIO_BOARDINFO=y # CONFIG_MFD_T7L66XB is not set -CONFIG_MIGHT_HAVE_PCI=y # CONFIG_MTD_COMPLEX_MAPPINGS is not set # CONFIG_MTD_IMPA7 is not set CONFIG_MTD_JEDECPROBE=y @@ -183,6 +181,8 @@ CONFIG_WATCHDOG_NOWAYOUT=y # CONFIG_WEXT_SPY is not set # CONFIG_WIRELESS_EXT is not set 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 |