generic: rtl8366: rename vlanmc and vlan4k related structures an functions

[openwrt.git] / target / linux / mx2 / config-2.6.34

diff --git a/target/linux/mx2/config-2.6.34 b/target/linux/mx2/config-2.6.34
index 0ffddae..254d16f 100644 (file)
--- a/target/linux/mx2/config-2.6.34
+++ b/target/linux/mx2/config-2.6.34
@@ -24,9 +24,7 @@ CONFIG_ARM_THUMB=y
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV is not set
 # CONFIG_BLK_DEV_INITRD is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV is not set
 # CONFIG_BLK_DEV_INITRD is not set

-CONFIG_BRIDGE_IGMP_SNOOPING=y

 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BSD_PROCESS_ACCT is not set

-# CONFIG_CEPH_FS is not set

 CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
 CONFIG_COMMON_CLKDEV=y
 CONFIG_COMPAT_BRK=y
 CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
 CONFIG_COMMON_CLKDEV=y
 CONFIG_COMPAT_BRK=y


@@ -45,9 +43,6 @@ CONFIG_CPU_TLB_V4WBI=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_USER is not set
 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_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FPE_FASTFPE is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FPE_FASTFPE is not set


@@ -84,43 +79,16 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_PROC_CPU=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_IMX_HAVE_IOMUX_V1=y
 CONFIG_HAVE_PROC_CPU=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_IMX_HAVE_IOMUX_V1=y

-# 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_INPUT=y
 CONFIG_INPUT=y

+CONFIG_INPUT_EVDEV=y

 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_INPUT_MISC is not set
 # CONFIG_ISDN_CAPI is not set
 # CONFIG_ISDN_DRV_GIGASET is not set
 # CONFIG_ISDN_I4L is not set
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_INPUT_MISC is not set
 # CONFIG_ISDN_CAPI is not set
 # CONFIG_ISDN_DRV_GIGASET is not set
 # CONFIG_ISDN_I4L is not set
 CONFIG_KEYBOARD_ATKBD=y

-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_IMX is not set
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_IMX=y

 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_NEWTON is not set


@@ -130,7 +98,6 @@ CONFIG_KEYBOARD_ATKBD=y
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 # CONFIG_LKDTM is not set
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 # CONFIG_LKDTM is not set

-# CONFIG_LOGFS is not set

 CONFIG_MACH_MX21=y
 # CONFIG_MACH_MX21ADS is not set
 # CONFIG_MACH_MX27 is not set
 CONFIG_MACH_MX21=y
 # CONFIG_MACH_MX21ADS is not set
 # CONFIG_MACH_MX27 is not set


@@ -139,7 +106,6 @@ CONFIG_MACH_VP6500=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_PHYSMAP=y

-# CONFIG_MUTEX_SPIN_ON_OWNER is not set

 # CONFIG_MXC_IRQ_PRIOR is not set
 # CONFIG_MXC_PWM is not set
 CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_MXC_IRQ_PRIOR is not set
 # CONFIG_MXC_PWM is not set
 CONFIG_NEED_DMA_MAP_STATE=y


@@ -155,7 +121,6 @@ CONFIG_SCSI_MOD=y
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y

-# CONFIG_SERIAL_TIMBERDALE is not set

 CONFIG_SERIO=y
 # CONFIG_SERIO_ALTERA_PS2 is not set
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO=y
 # CONFIG_SERIO_ALTERA_PS2 is not set
 CONFIG_SERIO_LIBPS2=y