diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-02-10 18:29:13 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-02-10 18:29:13 +0000 |
| commit | f3c6e548f53a70efcd19f8533f1638addc4a15bc (patch) | |
| tree | 35c0f4b937b3175a2b863bc7d1f75311457a39ac | |
| parent | ca905ca3b29598a8fae0751a71b961eed3467bf6 (diff) | |
| download | upstream-f3c6e548f53a70efcd19f8533f1638addc4a15bc.tar.gz upstream-f3c6e548f53a70efcd19f8533f1638addc4a15bc.tar.bz2 upstream-f3c6e548f53a70efcd19f8533f1638addc4a15bc.zip | |
[ar71xx] sync kernel configs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14469 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/ar71xx/config-2.6.27 | 1 | ||||
| -rw-r--r-- | target/linux/ar71xx/config-2.6.28 | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/ar71xx/config-2.6.27 b/target/linux/ar71xx/config-2.6.27 index 33e22b4c9a..ab751ad03d 100644 --- a/target/linux/ar71xx/config-2.6.27 +++ b/target/linux/ar71xx/config-2.6.27 @@ -172,6 +172,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 diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28 index f85ed65432..b00c4cee0b 100644 --- a/target/linux/ar71xx/config-2.6.28 +++ b/target/linux/ar71xx/config-2.6.28 @@ -27,7 +27,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" @@ -83,7 +82,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_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y @@ -119,7 +117,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 @@ -202,9 +199,7 @@ CONFIG_PHYLIB=y # 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 CONFIG_RFKILL_LEDS=y CONFIG_RTC_LIB=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -227,17 +222,16 @@ 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_SOUND_OSS_CORE=y CONFIG_SPI=y CONFIG_SPI_AR71XX=y CONFIG_SPI_BITBANG=y # CONFIG_SPI_GPIO is not set +# CONFIG_SPI_GPIO_OLD is not set CONFIG_SPI_MASTER=y # CONFIG_SPI_SPIDEV is not set CONFIG_SSB_POSSIBLE=y -# CONFIG_SUNRPC_REGISTER_V4 is not set CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_HAS_CPU_MIPS32_R2=y @@ -251,7 +245,6 @@ CONFIG_TRAD_SIGNALS=y CONFIG_USB=m CONFIG_USB_EHCI_AR71XX=y CONFIG_USB_EHCI_HCD=m -# 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 @@ -263,7 +256,6 @@ CONFIG_USB_SUPPORT=y CONFIG_VIDEO_MEDIA=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_COMMON=m -# CONFIG_W1_SLAVE_BQ27000 is not set CONFIG_YAFFS_9BYTE_TAGS=y CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y CONFIG_YAFFS_AUTO_YAFFS2=y |