apex: Revert back to 1.4.7 - what I thought I tested wasn't what I actually tested...

[openwrt.git] / target / linux / brcm47xx-2.6 / config / default

diff --git a/target/linux/brcm47xx-2.6/config/default b/target/linux/brcm47xx-2.6/config/default
index 2b28aa1..243ceb8 100644 (file)
--- a/target/linux/brcm47xx-2.6/config/default
+++ b/target/linux/brcm47xx-2.6/config/default
@@ -2,49 +2,15 @@ CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 # CONFIG_64BIT_PHYS_ADDR is not set
 # CONFIG_8139TOO is not set
 # CONFIG_64BIT is not set
 # CONFIG_64BIT_PHYS_ADDR is not set
 # CONFIG_8139TOO is not set

+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set

 # CONFIG_ARPD is not set
 # CONFIG_ATMEL is not set
 CONFIG_B44=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM43XX is not set
 CONFIG_BCM947XX=y
 # CONFIG_ARPD is not set
 # CONFIG_ATMEL is not set
 CONFIG_B44=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM43XX is not set
 CONFIG_BCM947XX=y

-CONFIG_BLK_DEV_AEC62XX=m
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-CONFIG_BLK_DEV_IDE=m
-# CONFIG_BLK_DEV_IDECD is not set
-CONFIG_BLK_DEV_IDEDISK=m
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-CONFIG_BLK_DEV_VIA82CXXX=m
+CONFIG_BITREVERSE=y

 # CONFIG_BONDING is not set
 # CONFIG_BRIDGE_NETFILTER is not set
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_BONDING is not set
 # CONFIG_BRIDGE_NETFILTER is not set
 # CONFIG_BSD_DISKLABEL is not set


@@ -115,10 +81,15 @@ CONFIG_CRYPTO_MD5=m
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 # CONFIG_E100 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 # CONFIG_E100 is not set

-# CONFIG_FIRMWARE_EDID is not set

 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y

+CONFIG_GENERIC_GPIO=y
+# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set

 # CONFIG_GEN_RTC is not set
 # CONFIG_GEN_RTC is not set

+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set

 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250


@@ -129,16 +100,7 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_256 is not set
 # CONFIG_HZ_48 is not set
 # CONFIG_I2C is not set
 # CONFIG_HZ_256 is not set
 # CONFIG_HZ_48 is not set
 # CONFIG_I2C is not set

-CONFIG_IDE=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_PCI_AUTO is not set
-CONFIG_IDEPCI_SHARE_IRQ=y
-# CONFIG_IDE_ARM is not set
-CONFIG_IDE_GENERIC=m
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE is not set

 # CONFIG_IKCONFIG is not set
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IKCONFIG is not set
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_INITRAMFS_SOURCE=""


@@ -152,23 +114,17 @@ CONFIG_INPUT=m
 CONFIG_IPW2200_QOS=y
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IPW2200_QOS=y
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_NF_ARPTABLES is not set

-# CONFIG_IP_NF_CT_PROTO_SCTP is not set

 # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
 # CONFIG_IP_NF_MATCH_ADDRTYPE is not set

-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set

 # CONFIG_IP_NF_TARGET_NETMAP is not set
 # CONFIG_IP_NF_TARGET_SAME is not set
 # CONFIG_IP_NF_TARGET_NETMAP is not set
 # CONFIG_IP_NF_TARGET_SAME is not set

-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set

 # CONFIG_IP_ROUTE_VERBOSE is not set
 CONFIG_IRQ_CPU=y
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_IP_ROUTE_VERBOSE is not set
 CONFIG_IRQ_CPU=y
 CONFIG_JFFS2_FS_DEBUG=0

-# CONFIG_LAN_SAA9730 is not set
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set

 # CONFIG_LIBCRC32C is not set
 # CONFIG_LLC2 is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_LIBCRC32C is not set
 # CONFIG_LLC2 is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_VR41XX is not set

-CONFIG_MINI_FO=y

 CONFIG_MIPS=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_BOSPORUS is not set
 CONFIG_MIPS=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_BOSPORUS is not set


@@ -203,6 +159,7 @@ CONFIG_MIPS_MT_DISABLED=y
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 CONFIG_MTD_BCM47XX=y
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 CONFIG_MTD_BCM47XX=y

+CONFIG_MTD_BLKDEVS=y

 CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set
 CONFIG_MTD_CFI=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set
 CONFIG_MTD_CFI=y


@@ -244,7 +201,6 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set

-# CONFIG_MTD_SPLIT_ROOTFS is not set

 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set


@@ -259,16 +215,28 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPGRE_BROADCAST is not set
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPGRE_BROADCAST is not set
 # CONFIG_NET_PKTGEN is not set

+CONFIG_NET_SCH_FIFO=y

 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set

+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_NAT_AMANDA is not set
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_NEEDED=y
+# CONFIG_NF_NAT_PPTP is not set
+CONFIG_NF_NAT_SIP=m
+# CONFIG_NF_NAT_TFTP is not set

 # CONFIG_NTFS_FS is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PMC_YOSEMITE is not set

+# CONFIG_PNPACPI is not set

 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_JBS is not set

-# CONFIG_PNX8550_V2PCI is not set
+# CONFIG_PNX8550_STB810 is not set

 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_PROC_KCORE is not set
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_PROC_KCORE is not set


@@ -302,6 +270,7 @@ CONFIG_SSB_PCICORE_HOSTMODE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_SERIAL=y
 # CONFIG_SSB_SILENT is not set
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_SERIAL=y
 # CONFIG_SSB_SILENT is not set

+CONFIG_SYSVIPC_SYSCTL=y

 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y


@@ -312,11 +281,15 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USB_CATC is not set
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USB_CATC is not set

+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set

 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 CONFIG_USB_EHCI_SPLIT_ISO=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 CONFIG_USB_EHCI_SPLIT_ISO=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set

+# CONFIG_USB_GTCO is not set

 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_KAWETH is not set

+# 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_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set


@@ -324,7 +297,6 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_DPCM is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_DPCM is not set
 # CONFIG_USB_STORAGE_FREECOM is not set

-# CONFIG_USB_STORAGE_ISD200 is not set

 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_SDDR09 is not set


@@ -333,3 +305,5 @@ CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_VIA_RHINE is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_VIA_RHINE is not set
 # CONFIG_WATCHDOG is not set

+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA_FLAG=1