diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-10-08 11:13:01 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-10-08 11:13:01 +0000 |
| commit | 0ddc97c252eefb8a56dd645c4ef3543a2df443c0 (patch) | |
| tree | ffb95ac583105e7185b332a3a65ddbf570833379 /target/linux/adm5120/router_be | |
| parent | 2fd7672ab3a061710b2d8586db36b16081d94e20 (diff) | |
| download | upstream-0ddc97c252eefb8a56dd645c4ef3543a2df443c0.tar.gz upstream-0ddc97c252eefb8a56dd645c4ef3543a2df443c0.tar.bz2 upstream-0ddc97c252eefb8a56dd645c4ef3543a2df443c0.zip | |
adm5120: sync kernel config
SVN-Revision: 17998
Diffstat (limited to 'target/linux/adm5120/router_be')
| -rw-r--r-- | target/linux/adm5120/router_be/config-2.6.28 | 2 | ||||
| -rw-r--r-- | target/linux/adm5120/router_be/config-2.6.30 | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/target/linux/adm5120/router_be/config-2.6.28 b/target/linux/adm5120/router_be/config-2.6.28 index 579f4c10ad..dac488f5da 100644 --- a/target/linux/adm5120/router_be/config-2.6.28 +++ b/target/linux/adm5120/router_be/config-2.6.28 @@ -11,6 +11,7 @@ CONFIG_ADM5120_MACH_P_335=y # CONFIG_ADM5120_OEM_INFINEON is not set # CONFIG_ADM5120_OEM_MIKROTIK is not set # CONFIG_ADM5120_OEM_MOTOROLA is not set +# CONFIG_ADM5120_OEM_OSBRIDGE is not set CONFIG_ADM5120_OEM_ZYXEL=y CONFIG_ADM5120_SOC_BGA=y CONFIG_ADM5120_WDT=y @@ -120,6 +121,7 @@ CONFIG_MII=m # CONFIG_MIKROTIK_RB532 is not set CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set +# CONFIG_MIPS_FPU_EMU is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 CONFIG_MIPS_MACHINE=y # CONFIG_MIPS_MALTA is not set diff --git a/target/linux/adm5120/router_be/config-2.6.30 b/target/linux/adm5120/router_be/config-2.6.30 index 6e334349e7..e954c7af32 100644 --- a/target/linux/adm5120/router_be/config-2.6.30 +++ b/target/linux/adm5120/router_be/config-2.6.30 @@ -2,6 +2,7 @@ CONFIG_32BIT=y # CONFIG_64BIT is not set CONFIG_ADM5120=y CONFIG_ADM5120_ENET=y +CONFIG_ADM5120_MACH_5GXI=y CONFIG_ADM5120_MACH_P_334WT=y CONFIG_ADM5120_MACH_P_335=y # CONFIG_ADM5120_OEM_CELLVISION is not set @@ -10,6 +11,7 @@ CONFIG_ADM5120_MACH_P_335=y # CONFIG_ADM5120_OEM_INFINEON is not set # CONFIG_ADM5120_OEM_MIKROTIK is not set # CONFIG_ADM5120_OEM_MOTOROLA is not set +CONFIG_ADM5120_OEM_OSBRIDGE=y CONFIG_ADM5120_OEM_ZYXEL=y CONFIG_ADM5120_SOC_BGA=y CONFIG_ADM5120_WDT=y @@ -63,12 +65,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_VR41XX is not set -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_CSRC_R4K_LIB=y CONFIG_DECOMPRESS_LZMA=y @@ -120,7 +116,6 @@ CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_LEMOTE_FULONG is not set -# CONFIG_LIB80211 is not set # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set @@ -131,6 +126,7 @@ CONFIG_MII=m # CONFIG_MIKROTIK_RB532 is not set CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set +# CONFIG_MIPS_FPU_EMU is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 CONFIG_MIPS_MACHINE=y # CONFIG_MIPS_MALTA is not set @@ -154,7 +150,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PCI=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DOMAINS=y -# CONFIG_PCI_STUB is not set # CONFIG_PCSPKR_PLATFORM is not set # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set |