Merge branch 'mti-next' of...

	select BOOT_RAW

	select CEVT_R4K

	select CSRC_R4K

	select CSRC_GIC

	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select DMA_NONCOHERENT

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_SMARTMIPS

	select SYS_SUPPORTS_MICROMIPS

	select USB_ARCH_HAS_EHCI

	select USB_EHCI_BIG_ENDIAN_DESC

	select USB_EHCI_BIG_ENDIAN_MMIO

config CEVT_R4K

	bool

config CEVT_GIC

	bool

config CEVT_SB1250

	bool

	  The page size is not necessarily 4KB.  Keep this in mind

	  when choosing a value for this option.

config CEVT_GIC

	bool "Use GIC global counter for clock events"

	depends on IRQ_GIC && !(MIPS_SEAD3 || MIPS_MT_SMTC)

	help

	  Use the GIC global counter for the clock events. The R4K clock

	  event driver is always present, so if the platform ends up not

	  detecting a GIC, it will fall back to the R4K timer for the

	  generation of clock events.

config BOARD_SCACHE

	bool

	  you don't know you probably don't have SmartMIPS and should say N

	  here.

config CPU_MICROMIPS

	depends on SYS_SUPPORTS_MICROMIPS

	bool "Build kernel using microMIPS ISA"

	help

	  When this option is enabled the kernel will be built using the

	  microMIPS ISA

config CPU_HAS_WB

	bool

config SYS_SUPPORTS_SMARTMIPS

	bool

config SYS_SUPPORTS_MICROMIPS

	bool

config ARCH_FLATMEM_ENABLE

	def_bool y

	depends on !NUMA && !CPU_LOONGSON2

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL $(undef-all) $(predef-le))

cflags-$(CONFIG_CPU_HAS_SMARTMIPS)	+= $(call cc-option,-msmartmips)

cflags-$(CONFIG_CPU_MICROMIPS) += $(call cc-option,-mmicromips -mno-jals)

cflags-$(CONFIG_SB1XXX_CORELIS)	+= $(call cc-option,-mno-sched-prolog) \

				   -fno-omit-frame-pointer

#include <asm/sections.h>

#include <asm/mach-ar7/ar7.h>

#include <asm/mips-boards/prom.h>

static int __init memsize(void)

{

CONFIG_CPU_LITTLE_ENDIAN=y

CONFIG_CPU_MIPS32_R2=y

CONFIG_MIPS_MT_SMP=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_HZ_100=y

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=15

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_RELAY=y

CONFIG_NAMESPACES=y

CONFIG_UTS_NS=y

CONFIG_IPC_NS=y

CONFIG_PID_NS=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_RELAY=y

CONFIG_EXPERT=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PCI=y

CONFIG_PM=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=m

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_NET_IPIP=m

CONFIG_NET_IPGRE=m

CONFIG_NET_IPGRE_BROADCAST=y

CONFIG_IP_MROUTE=y

CONFIG_IP_PIMSM_V1=y

CONFIG_IP_PIMSM_V2=y

CONFIG_IPV6_PIMSM_V2=y

CONFIG_NETWORK_SECMARK=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_QUEUE=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_IP_VS_SH=m

CONFIG_IP_VS_SED=m

CONFIG_IP_VS_NQ=m

CONFIG_IP_VS_FTP=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_IP_NF_QUEUE=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_ADDRTYPE=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_LOG=m

CONFIG_IP_NF_TARGET_ULOG=m

CONFIG_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_NF_NAT_SNMP_BASIC=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_CLUSTERIP=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_IP6_NF_QUEUE=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m

CONFIG_IP6_NF_MATCH_FRAG=m

CONFIG_IP6_NF_MATCH_MH=m

CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_TARGET_LOG=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_MAC80211_RC_PID=y

CONFIG_MAC80211_RC_DEFAULT_PID=y

CONFIG_MAC80211_MESH=y

CONFIG_MAC80211_LEDS=y

CONFIG_RFKILL=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CONNECTOR=m

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_OOPS=m

CONFIG_BLK_DEV_RAM=y

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

# CONFIG_MISC_DEVICES is not set

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_IDE_GENERIC=y

CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m

CONFIG_NETDEVICES=y

CONFIG_IFB=m

CONFIG_DUMMY=m

CONFIG_BONDING=m

CONFIG_MACVLAN=m

CONFIG_DUMMY=m

CONFIG_EQUALIZER=m

CONFIG_IFB=m

CONFIG_MACVLAN=m

CONFIG_TUN=m

CONFIG_VETH=m

# CONFIG_NET_VENDOR_3COM is not set

CONFIG_PCNET32=y

CONFIG_CHELSIO_T3=m

CONFIG_AX88796=m

CONFIG_NETXEN_NIC=m

CONFIG_TC35815=m

CONFIG_MARVELL_PHY=m

CONFIG_DAVICOM_PHY=m

CONFIG_QSEMI_PHY=m

CONFIG_BROADCOM_PHY=m

CONFIG_ICPLUS_PHY=m

CONFIG_REALTEK_PHY=m

CONFIG_MDIO_BITBANG=m

CONFIG_NET_ETHERNET=y

CONFIG_AX88796=m

CONFIG_NET_PCI=y

CONFIG_PCNET32=y

CONFIG_TC35815=m

CONFIG_CHELSIO_T3=m

CONFIG_NETXEN_NIC=m

CONFIG_ATMEL=m

CONFIG_PCI_ATMEL=m

CONFIG_PRISM54=m

CONFIG_HOSTAP_PCI=m

CONFIG_IPW2100=m

CONFIG_IPW2100_MONITOR=y

CONFIG_IPW2200=m

CONFIG_IPW2200_MONITOR=y

CONFIG_IPW2200_PROMISCUOUS=y

CONFIG_IPW2200_QOS=y

CONFIG_LIBERTAS=m

CONFIG_HERMES=m

CONFIG_PLX_HERMES=m

CONFIG_TMD_HERMES=m

CONFIG_NORTEL_HERMES=m

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO_I8042 is not set

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_HID=m

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGER_TIMER=m

CONFIG_LEDS_TRIGGER_IDE_DISK=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=m

CONFIG_LEDS_TRIGGER_BACKLIGHT=m

CONFIG_LEDS_TRIGGER_DEFAULT_ON=m

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_CMOS=y

CONFIG_UIO=m

CONFIG_XFS_POSIX_ACL=y

CONFIG_QUOTA=y

CONFIG_QFMT_V2=y

CONFIG_AUTOFS_FS=y

CONFIG_FUSE_FS=m

CONFIG_ISO9660_FS=m

CONFIG_JOLIET=y

CONFIG_SYSV_FS=m

CONFIG_UFS_FS=m

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=y

CONFIG_NFSD_V3=y

CONFIG_NLS_ISO8859_15=m

CONFIG_NLS_KOI8_R=m

CONFIG_NLS_KOI8_U=m

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_LRW=m

CONFIG_MIPS_MALTA=y

CONFIG_CPU_LITTLE_ENDIAN=y

CONFIG_CPU_MIPS32_R2=y

CONFIG_MIPS_VPE_LOADER=y

CONFIG_MIPS_VPE_APSP_API=y

CONFIG_HZ_100=y

CONFIG_LOCALVERSION="aprp"

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_AUDIT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=15

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PCI=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_MULTIPATH=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_NET_IPIP=m

CONFIG_IP_MROUTE=y

CONFIG_IP_PIMSM_V1=y

CONFIG_IP_PIMSM_V2=y

CONFIG_SYN_COOKIES=y

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m

# CONFIG_INET_LRO is not set

CONFIG_IPV6_PRIVACY=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_IPV6_TUNNEL=m

CONFIG_BRIDGE=m

CONFIG_VLAN_8021Q=m

CONFIG_ATALK=m

CONFIG_DEV_APPLETALK=m

CONFIG_IPDDP=m

CONFIG_IPDDP_ENCAP=y

CONFIG_IPDDP_DECAP=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m

CONFIG_NET_SCH_HTB=m

CONFIG_NET_SCH_HFSC=m

CONFIG_NET_SCH_PRIO=m

CONFIG_NET_SCH_RED=m

CONFIG_NET_SCH_SFQ=m

CONFIG_NET_SCH_TEQL=m

CONFIG_NET_SCH_TBF=m

CONFIG_NET_SCH_GRED=m

CONFIG_NET_SCH_DSMARK=m

CONFIG_NET_SCH_NETEM=m

CONFIG_NET_SCH_INGRESS=m

CONFIG_NET_CLS_BASIC=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_CLS_FW=m

CONFIG_NET_CLS_U32=m

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_RSVP6=m

CONFIG_NET_CLS_ACT=y

CONFIG_NET_ACT_POLICE=y

CONFIG_NET_CLS_IND=y

# CONFIG_WIRELESS is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_IDE=y

# CONFIG_IDE_PROC_FS is not set

# CONFIG_IDEPCI_PCIBUS_ORDER is not set

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_PIIX=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_ADAPTEC is not set

# CONFIG_NET_VENDOR_ALTEON is not set

CONFIG_PCNET32=y

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CISCO is not set

# CONFIG_NET_VENDOR_DEC is not set

# CONFIG_NET_VENDOR_DLINK is not set

# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_EXAR is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MELLANOX is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MYRI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NVIDIA is not set

# CONFIG_NET_VENDOR_OKI is not set

# CONFIG_NET_PACKET_ENGINE is not set

# CONFIG_NET_VENDOR_QLOGIC is not set

# CONFIG_NET_VENDOR_REALTEK is not set

# CONFIG_NET_VENDOR_RDC is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SILAN is not set

# CONFIG_NET_VENDOR_SIS is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SUN is not set

# CONFIG_NET_VENDOR_TEHUTI is not set

# CONFIG_NET_VENDOR_TI is not set

# CONFIG_NET_VENDOR_TOSHIBA is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_WLAN is not set

# CONFIG_VT is not set

CONFIG_LEGACY_PTY_COUNT=16

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_HW_RANDOM=y

# CONFIG_HWMON is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m

CONFIG_FB=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FB_MATROX=y

CONFIG_FB_MATROX_G=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_USB_UHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_IDE_DISK=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_CMOS=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_XFS_FS=y

CONFIG_XFS_QUOTA=y

CONFIG_XFS_POSIX_ACL=y

CONFIG_QUOTA=y

CONFIG_QFMT_V2=y

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_CIFS=m

CONFIG_CIFS_WEAK_PW_HASH=y

CONFIG_CIFS_XATTR=y

CONFIG_CIFS_POSIX=y

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_ISO8859_1=m

# CONFIG_FTRACE is not set

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set