From: Gabor Juhos Date: Thu, 10 Jun 2010 08:09:36 +0000 (+0000) Subject: ar71xx: sync kernel configs X-Git-Tag: reboot~19668 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=65de4c21029f11bb17e8475dc98fd62b33d18ad3;p=openwrt%2Fstaging%2Fblogic.git ar71xx: sync kernel configs SVN-Revision: 21745 --- diff --git a/target/linux/ar71xx/config-2.6.33 b/target/linux/ar71xx/config-2.6.33 index fbea210bc737..94cbd754a490 100644 --- a/target/linux/ar71xx/config-2.6.33 +++ b/target/linux/ar71xx/config-2.6.33 @@ -273,5 +273,6 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y # CONFIG_TC35815 is not set CONFIG_TRAD_SIGNALS=y +# CONFIG_TREE_PREEMPT_RCU is not set CONFIG_USB_SUPPORT=y CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ar71xx/config-2.6.34 b/target/linux/ar71xx/config-2.6.34 index e0c2f935dd8d..3a719a88a3b6 100644 --- a/target/linux/ar71xx/config-2.6.34 +++ b/target/linux/ar71xx/config-2.6.34 @@ -98,18 +98,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_CRYSTALHD is not set CONFIG_CSRC_R4K=y CONFIG_CSRC_R4K_LIB=y CONFIG_DECOMPRESS_LZMA=y -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set CONFIG_DEVPORT=y # CONFIG_DM9000 is not set -CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DT3155 is not set CONFIG_EARLY_PRINTK=y # CONFIG_FSNOTIFY is not set CONFIG_GENERIC_CLOCKEVENTS=y @@ -120,11 +114,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_GPIOLIB=y -# CONFIG_GPIO_IT8761E is not set -# CONFIG_GPIO_MAX7300 is not set CONFIG_GPIO_NXP_74HC153=y CONFIG_GPIO_PCF857X=y -# CONFIG_GPIO_SCH is not set CONFIG_GPIO_SYSFS=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y @@ -139,56 +130,22 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IDE=y CONFIG_HAVE_OPROFILE=y -# CONFIG_HTC_I2CPLD is not set CONFIG_HW_HAS_PCI=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_GPIO=y -# CONFIG_I2C_SMBUS is not set -# CONFIG_I2C_XILINX is not set CONFIG_IMAGE_CMDLINE_HACK=y # CONFIG_INITRAMFS_COMPRESSION_LZO is not set CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_SOURCE="../../root" -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -CONFIG_INLINE_READ_UNLOCK=y -# CONFIG_INLINE_READ_UNLOCK_BH is not set -CONFIG_INLINE_READ_UNLOCK_IRQ=y -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -CONFIG_INLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -CONFIG_INLINE_WRITE_UNLOCK=y -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set CONFIG_IRQ_CPU=y -# CONFIG_KSZ884X_PCI is not set # CONFIG_LEDS_GPIO is not set # CONFIG_LEDS_RB750 is not set # CONFIG_LEDS_WNDR3700_USB is not set -# CONFIG_LOGFS is not set CONFIG_LOONGSON_UART_BASE=y -# CONFIG_LPC_SCH is not set # CONFIG_M25PXX_USE_FAST_READ is not set # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set @@ -197,11 +154,6 @@ CONFIG_LOONGSON_UART_BASE=y # CONFIG_MACH_TX39XX is not set # CONFIG_MACH_TX49XX is not set # CONFIG_MACH_VR41XX is not set -# CONFIG_MAX63XX_WATCHDOG is not set -# CONFIG_MFD_88PM860X is not set -# CONFIG_MFD_MAX8925 is not set -# CONFIG_MFD_TIMBERDALE is not set -# CONFIG_MFD_WM8994 is not set CONFIG_MICREL_PHY=y # CONFIG_MIKROTIK_RB532 is not set CONFIG_MIPS=y @@ -222,8 +174,8 @@ CONFIG_MTD_MYLOADER_PARTS=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_WRT160NL_PARTS=y -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_MYLOADER=y +CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_DSA=y CONFIG_NET_DSA_AR7240=y CONFIG_NET_DSA_MV88E6060=y @@ -254,10 +206,10 @@ CONFIG_RTL8366S_PHY=y CONFIG_RTL8366_SMI=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_SCSI_DMA is not set +CONFIG_SCSI_MOD=y # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_NR_UARTS=1 CONFIG_SERIAL_8250_RUNTIME_UARTS=1 -# CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SGI_IP22 is not set # CONFIG_SGI_IP27 is not set # CONFIG_SGI_IP28 is not set diff --git a/target/linux/ar71xx/config-2.6.35 b/target/linux/ar71xx/config-2.6.35 index e0c2f935dd8d..900609f44ba7 100644 --- a/target/linux/ar71xx/config-2.6.35 +++ b/target/linux/ar71xx/config-2.6.35 @@ -98,18 +98,14 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_VR41XX is not set -# CONFIG_CRYSTALHD is not set CONFIG_CSRC_R4K=y CONFIG_CSRC_R4K_LIB=y CONFIG_DECOMPRESS_LZMA=y -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +# CONFIG_DEFAULT_HYBLA is not set +# CONFIG_DEFAULT_VENO is not set CONFIG_DEVPORT=y # CONFIG_DM9000 is not set -CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DT3155 is not set CONFIG_EARLY_PRINTK=y # CONFIG_FSNOTIFY is not set CONFIG_GENERIC_CLOCKEVENTS=y @@ -120,11 +116,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_GPIOLIB=y -# CONFIG_GPIO_IT8761E is not set -# CONFIG_GPIO_MAX7300 is not set CONFIG_GPIO_NXP_74HC153=y CONFIG_GPIO_PCF857X=y -# CONFIG_GPIO_SCH is not set CONFIG_GPIO_SYSFS=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y @@ -139,56 +132,22 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IDE=y CONFIG_HAVE_OPROFILE=y -# CONFIG_HTC_I2CPLD is not set CONFIG_HW_HAS_PCI=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_GPIO=y -# CONFIG_I2C_SMBUS is not set -# CONFIG_I2C_XILINX is not set CONFIG_IMAGE_CMDLINE_HACK=y # CONFIG_INITRAMFS_COMPRESSION_LZO is not set CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_SOURCE="../../root" -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -CONFIG_INLINE_READ_UNLOCK=y -# CONFIG_INLINE_READ_UNLOCK_BH is not set -CONFIG_INLINE_READ_UNLOCK_IRQ=y -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -CONFIG_INLINE_SPIN_UNLOCK=y -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -CONFIG_INLINE_WRITE_UNLOCK=y -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set CONFIG_IRQ_CPU=y -# CONFIG_KSZ884X_PCI is not set # CONFIG_LEDS_GPIO is not set # CONFIG_LEDS_RB750 is not set # CONFIG_LEDS_WNDR3700_USB is not set -# CONFIG_LOGFS is not set CONFIG_LOONGSON_UART_BASE=y -# CONFIG_LPC_SCH is not set # CONFIG_M25PXX_USE_FAST_READ is not set # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set @@ -197,11 +156,6 @@ CONFIG_LOONGSON_UART_BASE=y # CONFIG_MACH_TX39XX is not set # CONFIG_MACH_TX49XX is not set # CONFIG_MACH_VR41XX is not set -# CONFIG_MAX63XX_WATCHDOG is not set -# CONFIG_MFD_88PM860X is not set -# CONFIG_MFD_MAX8925 is not set -# CONFIG_MFD_TIMBERDALE is not set -# CONFIG_MFD_WM8994 is not set CONFIG_MICREL_PHY=y # CONFIG_MIKROTIK_RB532 is not set CONFIG_MIPS=y @@ -222,8 +176,8 @@ CONFIG_MTD_MYLOADER_PARTS=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_WRT160NL_PARTS=y -# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_MYLOADER=y +CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_DSA=y CONFIG_NET_DSA_AR7240=y CONFIG_NET_DSA_MV88E6060=y @@ -254,10 +208,10 @@ CONFIG_RTL8366S_PHY=y CONFIG_RTL8366_SMI=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_SCSI_DMA is not set +CONFIG_SCSI_MOD=y # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_NR_UARTS=1 CONFIG_SERIAL_8250_RUNTIME_UARTS=1 -# CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SGI_IP22 is not set # CONFIG_SGI_IP27 is not set # CONFIG_SGI_IP28 is not set