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/iop32x | |
| 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/iop32x')
| -rw-r--r-- | target/linux/iop32x/base-files/etc/config/network | 5 | ||||
| -rw-r--r-- | target/linux/iop32x/config-3.3 | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/target/linux/iop32x/base-files/etc/config/network b/target/linux/iop32x/base-files/etc/config/network index 1d9b55b2d..2c3ca87e9 100644 --- a/target/linux/iop32x/base-files/etc/config/network +++ b/target/linux/iop32x/base-files/etc/config/network @@ -9,3 +9,8 @@ config interface loopback config interface lan option ifname eth0 option proto dhcp + +config interface lan6 + option ifname @lan + option proto dhcpv6 + option reqprefix no diff --git a/target/linux/iop32x/config-3.3 b/target/linux/iop32x/config-3.3 index f4b9da9f8..6ce112bf1 100644 --- a/target/linux/iop32x/config-3.3 +++ b/target/linux/iop32x/config-3.3 @@ -131,15 +131,19 @@ CONFIG_USB=m CONFIG_USB_ARCH_HAS_XHCI=y CONFIG_USB_COMMON=m CONFIG_USB_EHCI_HCD=m +# CONFIG_USB_EHCI_HCD_PLATFORM is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_PLATFORM is not set CONFIG_USB_SUPPORT=y CONFIG_USB_UHCI_HCD=m CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VM_EVENT_COUNTERS=y CONFIG_WAN=y CONFIG_XSCALE_PMU=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZONE_DMA_FLAG=0 |