move some 2.6.27 config stuff from ixp to generic, use slab instead of slub by defaul...

[openwrt/svn-archive/archive.git] / target / linux / ixp4xx / config-2.6.27

diff --git a/target/linux/ixp4xx/config-2.6.27 b/target/linux/ixp4xx/config-2.6.27
index 80f71e6a68257c82feb5bf58b2ead5729186f59a..f0f2937dbdb9404bf2e14762896971d215e5bcb2 100644 (file)
--- a/target/linux/ixp4xx/config-2.6.27
+++ b/target/linux/ixp4xx/config-2.6.27
@@ -75,7 +75,6 @@ CONFIG_BOUNCE=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
 # CONFIG_CONFIGFS_FS is not set

-# CONFIG_CONTEXT_SWITCH_TRACER is not set

 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y


@@ -83,7 +82,6 @@ CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y

-# CONFIG_CPU_DCACHE_DISABLE is not set

 CONFIG_CPU_IXP43X=y
 CONFIG_CPU_IXP46X=y
 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_IXP43X=y
 CONFIG_CPU_IXP46X=y
 CONFIG_CPU_PABRT_NOIFAR=y


@@ -106,7 +104,6 @@ CONFIG_DMABOUNCE_DEBUG=y
 # CONFIG_DMADEVICES is not set
 CONFIG_DNOTIFY=y
 # CONFIG_DSCC4 is not set
 # CONFIG_DMADEVICES is not set
 CONFIG_DNOTIFY=y
 # CONFIG_DSCC4 is not set

-# CONFIG_E100 is not set

 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FARSYNC is not set
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FARSYNC is not set
 CONFIG_FIRMWARE_IN_KERNEL=y


@@ -141,12 +138,6 @@ CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y

-CONFIG_HDLC=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-CONFIG_HDLC_RAW=m
-# CONFIG_HDLC_RAW_ETH is not set

 # CONFIG_HERMES is not set
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
 # CONFIG_HERMES is not set
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y


@@ -163,41 +154,13 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_GPIO=y
 # CONFIG_I2C_IOP3XX is not set
 # CONFIG_I2C_ISCH is not set
 CONFIG_I2C_GPIO=y
 # CONFIG_I2C_IOP3XX is not set
 # CONFIG_I2C_ISCH is not set

-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set

 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=m
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=m

-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set

 CONFIG_IP_MROUTE=y
 CONFIG_IP_MROUTE=y

-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set

 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y

-# CONFIG_IRQSOFF_TRACER is not set

 # CONFIG_ISDN is not set
 # CONFIG_ISDN is not set

-# CONFIG_IWLWIFI_LEDS is not set

 # CONFIG_IWMMXT is not set
 CONFIG_IXP4XX_ETH=y
 # CONFIG_IXP4XX_HSS is not set
 # CONFIG_IWMMXT is not set
 CONFIG_IXP4XX_ETH=y
 # CONFIG_IXP4XX_HSS is not set


@@ -205,9 +168,8 @@ CONFIG_IXP4XX_ETH=y
 CONFIG_IXP4XX_NPE=y
 CONFIG_IXP4XX_QMGR=y
 CONFIG_IXP4XX_WATCHDOG=y
 CONFIG_IXP4XX_NPE=y
 CONFIG_IXP4XX_QMGR=y
 CONFIG_IXP4XX_WATCHDOG=y

+CONFIG_KALLSYMS=y

 CONFIG_KMOD=y
 CONFIG_KMOD=y

-# CONFIG_LANMEDIA is not set
-# CONFIG_LATENCYTOP is not set

 # CONFIG_LEDS_ALIX is not set
 CONFIG_LEDS_FSG=y
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_ALIX is not set
 CONFIG_LEDS_FSG=y
 CONFIG_LEDS_GPIO=y


@@ -278,10 +240,6 @@ CONFIG_MTD_CHAR=y
 # CONFIG_MTD_CMDLINE_PARTS is not set
 CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_CONCAT is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_CONCAT is not set

-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set

 CONFIG_MTD_GEN_PROBE=y
 CONFIG_MTD_IXP4XX=y
 # CONFIG_MTD_JEDECPROBE is not set
 CONFIG_MTD_GEN_PROBE=y
 CONFIG_MTD_IXP4XX=y
 # CONFIG_MTD_JEDECPROBE is not set


@@ -307,13 +265,6 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set

-# CONFIG_NE2K_PCI is not set
-# CONFIG_NET_CLS_ACT is not set
-# CONFIG_NET_CLS_IND is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_VENDOR_3COM is not set

 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set


@@ -321,8 +272,6 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NVRAM is not set
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NVRAM is not set

-# CONFIG_OCF_OCF is not set
-# CONFIG_OMFS_FS is not set

 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PATA_ARTOP=m
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PATA_ARTOP=m


@@ -330,15 +279,8 @@ CONFIG_PATA_IXP4XX_CF=m
 # CONFIG_PATA_SCH is not set
 # CONFIG_PC300 is not set
 CONFIG_PCI=y
 # CONFIG_PATA_SCH is not set
 # CONFIG_PC300 is not set
 CONFIG_PCI=y

-# CONFIG_PCI200SYN is not set
-# CONFIG_PCIPCWATCHDOG is not set

 CONFIG_PCI_SYSCALL=y
 CONFIG_PCI_SYSCALL=y

-# CONFIG_PRISM54 is not set

 # CONFIG_R6040 is not set
 # CONFIG_R6040 is not set

-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

 CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
 CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set


@@ -366,7 +308,6 @@ CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y

-# CONFIG_SCHED_TRACER is not set

 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_WAIT_SCAN=m


@@ -380,10 +321,11 @@ CONFIG_SENSORS_W83781D=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SHMEM is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SHMEM is not set

-# CONFIG_SMC91X is not set
+CONFIG_SLAB=y
+CONFIG_SLABINFO=y
+# CONFIG_SLUB is not set

 # CONFIG_SND_ARM is not set
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_DRIVERS=y

-# CONFIG_SND_PCI is not set

 CONFIG_SND_USB=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SND_USB=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set


@@ -412,9 +354,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=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_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m

-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_STORAGE_SIERRA is not set

 CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USE_GENERIC_SMP_HELPERS is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USE_GENERIC_SMP_HELPERS is not set


@@ -422,17 +361,9 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIA_VELOCITY=m
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIA_VELOCITY=m

-CONFIG_VIDEO_MEDIA=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_COMMON=m

 # CONFIG_VLAN_8021Q_GVRP is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_VLAN_8021Q_GVRP is not set
 CONFIG_VM_EVENT_COUNTERS=y

-CONFIG_WAN=y
-# CONFIG_WANXL is not set
-CONFIG_WIRELESS_EXT_SYSFS=y

 CONFIG_XFRM_IPCOMP=m
 CONFIG_XFRM_IPCOMP=m

-# CONFIG_XFS_FS is not set
-# CONFIG_XIP_KERNEL is not set

 CONFIG_XSCALE_PMU=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_XSCALE_PMU=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0