From b2946e7e8aca243281e7ee95e5d17165039970f0 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 15 Dec 2008 19:44:04 +0000 Subject: [PATCH] sync kernel configs SVN-Revision: 13658 --- target/linux/ar71xx/config-2.6.26 | 1 + target/linux/ar71xx/config-2.6.27 | 8 ++------ target/linux/ar71xx/config-2.6.28 | 16 +++++++--------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/target/linux/ar71xx/config-2.6.26 b/target/linux/ar71xx/config-2.6.26 index f2e2f170f0ea..f091cdf58aa5 100644 --- a/target/linux/ar71xx/config-2.6.26 +++ b/target/linux/ar71xx/config-2.6.26 @@ -186,6 +186,7 @@ CONFIG_PHYLIB=y # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set +CONFIG_PROM_EMU=y # CONFIG_QSEMI_PHY is not set # CONFIG_R6040 is not set # CONFIG_REALTEK_PHY is not set diff --git a/target/linux/ar71xx/config-2.6.27 b/target/linux/ar71xx/config-2.6.27 index b542deb4b078..566c8cda51c8 100644 --- a/target/linux/ar71xx/config-2.6.27 +++ b/target/linux/ar71xx/config-2.6.27 @@ -23,7 +23,6 @@ CONFIG_ATHEROS_AR71XX=y CONFIG_BASE_SMALL=0 # CONFIG_BCM47XX is not set CONFIG_BITREVERSE=y -# CONFIG_BROADCOM_PHY is not set CONFIG_CEVT_R4K=y CONFIG_CLASSIC_RCU=y CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit" @@ -72,7 +71,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_GPIO=y # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set CONFIG_GPIOLIB=y -# CONFIG_GPIO_MAX7301 is not set CONFIG_GPIO_SYSFS=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y @@ -109,7 +107,6 @@ CONFIG_LEDS_GPIO=m # CONFIG_MACH_TX39XX is not set # CONFIG_MACH_TX49XX is not set # CONFIG_MACH_VR41XX is not set -# CONFIG_MDIO_BITBANG is not set # CONFIG_MFD_CORE is not set # CONFIG_MFD_TMIO is not set CONFIG_MICREL_PHY=y @@ -171,6 +168,7 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y # CONFIG_MTD_SLRAM is not set CONFIG_MYLOADER=y # CONFIG_NATSEMI is not set +CONFIG_NF_CT_ACCT=y # CONFIG_NO_IOPORT is not set CONFIG_PAGEFLAGS_EXTENDED=y # CONFIG_PAGE_SIZE_16KB is not set @@ -186,9 +184,8 @@ CONFIG_PHYLIB=y # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set # CONFIG_PROBE_INITRD_HEADER is not set -# CONFIG_QSEMI_PHY is not set +CONFIG_PROM_EMU=y # CONFIG_R6040 is not set -# CONFIG_REALTEK_PHY is not set CONFIG_RFKILL_LEDS=y CONFIG_RTC_LIB=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -211,7 +208,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1 # CONFIG_SIBYTE_SWARM is not set # CONFIG_SLAB is not set CONFIG_SLUB=y -# CONFIG_SMSC_PHY is not set # CONFIG_SOFT_WATCHDOG is not set # CONFIG_SPARSEMEM_STATIC is not set # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28 index c17fe15e7694..077260dd9c43 100644 --- a/target/linux/ar71xx/config-2.6.28 +++ b/target/linux/ar71xx/config-2.6.28 @@ -8,7 +8,6 @@ CONFIG_AR71XX_MACH_AP83=y CONFIG_AR71XX_MACH_AW_NR580=y CONFIG_AR71XX_MACH_GENERIC=y CONFIG_AR71XX_MACH_RB_4XX=y -CONFIG_AR71XX_MACH_ROUTERSTATION=y CONFIG_AR71XX_MACH_TEW_632BRP=y CONFIG_AR71XX_MACH_WP543=y CONFIG_AR71XX_WDT=y @@ -57,7 +56,12 @@ 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_RNG=m +CONFIG_CRYPTO_AEAD2=m +CONFIG_CRYPTO_ALGAPI2=m +CONFIG_CRYPTO_BLKCIPHER2=m +CONFIG_CRYPTO_HASH2=m +CONFIG_CRYPTO_MANAGER2=m +CONFIG_CRYPTO_RNG2=m CONFIG_CSRC_R4K=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set @@ -192,6 +196,7 @@ CONFIG_PHYLIB=y # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set # CONFIG_PROBE_INITRD_HEADER is not set +CONFIG_PROM_EMU=y # CONFIG_QSEMI_PHY is not set # CONFIG_R6040 is not set # CONFIG_REALTEK_PHY is not set @@ -243,20 +248,13 @@ CONFIG_TRAD_SIGNALS=y CONFIG_USB=m CONFIG_USB_EHCI_AR71XX=y CONFIG_USB_EHCI_HCD=m -# CONFIG_USB_HWA_HCD is not set # CONFIG_USB_NET_SMSC95XX is not set CONFIG_USB_OHCI_AR71XX=y # 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_SEVSEG is not set CONFIG_USB_SUPPORT=y -# CONFIG_USB_TMC is not set # CONFIG_USB_UHCI_HCD is not set -# CONFIG_USB_VST is not set -# CONFIG_USB_WHCI_HCD is not set -# CONFIG_USB_WUSB is not set -# CONFIG_USB_WUSB_CBAF is not set # CONFIG_VGASTATE is not set # CONFIG_VIA_RHINE is not set CONFIG_VIDEO_MEDIA=m -- 2.30.2