Commit 64724ef8 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of git://git.marvell.com/orion

parents 283a5d25 3a5df4bf

arch/arm/configs/kirkwood_defconfig

+69 −23
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29-rc5

# Tue Mar  3 21:45:57 2009

# Linux kernel version: 2.6.30-rc4

# Mon May  4 11:58:57 2009

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -66,20 +66,20 @@ CONFIG_NAMESPACES=y 
# CONFIG_BLK_DEV_INITRD is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y

# CONFIG_EMBEDDED is not set

CONFIG_UID16=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_COMPAT_BRK=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y
@@ -89,6 +89,7 @@ CONFIG_AIO=y 
CONFIG_VM_EVENT_COUNTERS=y

CONFIG_PCI_QUIRKS=y

CONFIG_SLUB_DEBUG=y

CONFIG_COMPAT_BRK=y

# CONFIG_SLAB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set
@@ -101,6 +102,7 @@ CONFIG_KPROBES=y 
CONFIG_KRETPROBES=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

# CONFIG_SLOW_WORK is not set

CONFIG_HAVE_GENERIC_DMA_COHERENT=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y
@@ -113,7 +115,6 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -142,6 +143,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" 
# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set
@@ -162,6 +164,7 @@ CONFIG_ARCH_KIRKWOOD=y 
# CONFIG_ARCH_ORION5X is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_MMP is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set
@@ -217,6 +220,7 @@ CONFIG_PCI_SYSCALL=y 
CONFIG_PCI_LEGACY=y

# CONFIG_PCI_DEBUG is not set

# CONFIG_PCI_STUB is not set

# CONFIG_PCI_IOV is not set

# CONFIG_PCCARD is not set



#
@@ -237,6 +241,7 @@ CONFIG_AEABI=y 
CONFIG_ARCH_FLATMEM_HAS_HOLES=y

# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set

# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

# CONFIG_HIGHMEM is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -249,6 +254,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 
CONFIG_ZONE_DMA_FLAG=0

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

CONFIG_ALIGNMENT_TRAP=y



#
@@ -293,7 +300,6 @@ CONFIG_NET=y 
#

# Networking options

#

CONFIG_COMPAT_NET_DEV_OPS=y

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y
@@ -324,7 +330,7 @@ CONFIG_IP_PNP_BOOTP=y 
CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

# CONFIG_INET_LRO is not set

CONFIG_INET_LRO=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -357,6 +363,7 @@ CONFIG_NET_DSA_MV88E6123_61_65=y 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set
@@ -365,20 +372,20 @@ CONFIG_NET_DSA_MV88E6123_61_65=y 
#

CONFIG_NET_PKTGEN=m

# CONFIG_NET_TCPPROBE is not set

# CONFIG_NET_DROP_MONITOR is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_PHONET is not set

CONFIG_WIRELESS=y

CONFIG_CFG80211=y

# CONFIG_CFG80211_REG_DEBUG is not set

# CONFIG_NL80211 is not set

CONFIG_WIRELESS_OLD_REGULATORY=y

CONFIG_WIRELESS_EXT=y

CONFIG_WIRELESS_EXT_SYSFS=y

CONFIG_LIB80211=y

# CONFIG_LIB80211_DEBUG is not set

CONFIG_MAC80211=y



#
@@ -513,7 +520,6 @@ CONFIG_MTD_NAND_ORION=y 
# LPDDR flash memory drivers

#

# CONFIG_MTD_LPDDR is not set

# CONFIG_MTD_QINFO_PROBE is not set



#

# UBI - Unsorted block images
@@ -592,8 +598,10 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_SAS is not set

# CONFIG_SCSI_MPT2SAS is not set

# CONFIG_SCSI_HPTIOP is not set

# CONFIG_LIBFC is not set

# CONFIG_LIBFCOE is not set

# CONFIG_FCOE is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -614,6 +622,7 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_SCSI_DEBUG is not set

# CONFIG_SCSI_SRP is not set

# CONFIG_SCSI_DH is not set

# CONFIG_SCSI_OSD_INITIATOR is not set

CONFIG_ATA=y

# CONFIG_ATA_NONSTANDARD is not set

CONFIG_SATA_PMP=y
@@ -687,6 +696,7 @@ CONFIG_SATA_MV=y 
# CONFIG_IEEE1394 is not set

# CONFIG_I2O is not set

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set
@@ -724,8 +734,10 @@ CONFIG_MII=y 
# CONFIG_SMC91X is not set

# CONFIG_DM9000 is not set

# CONFIG_ENC28J60 is not set

# CONFIG_ETHOC is not set

# CONFIG_SMC911X is not set

# CONFIG_SMSC911X is not set

# CONFIG_DNET is not set

# CONFIG_NET_TULIP is not set

# CONFIG_HP100 is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -763,6 +775,7 @@ CONFIG_NETDEV_1000=y 
# CONFIG_E1000E is not set

# CONFIG_IP1000 is not set

# CONFIG_IGB is not set

# CONFIG_IGBVF is not set

# CONFIG_NS83820 is not set

# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set
@@ -777,6 +790,7 @@ CONFIG_MV643XX_ETH=y 
# CONFIG_QLA3XXX is not set

# CONFIG_ATL1 is not set

# CONFIG_ATL1E is not set

# CONFIG_ATL1C is not set

# CONFIG_JME is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_TR is not set
@@ -789,10 +803,11 @@ CONFIG_WLAN_80211=y 
CONFIG_LIBERTAS=y

# CONFIG_LIBERTAS_USB is not set

CONFIG_LIBERTAS_SDIO=y

# CONFIG_LIBERTAS_SPI is not set

# CONFIG_LIBERTAS_DEBUG is not set

# CONFIG_LIBERTAS_THINFIRM is not set

# CONFIG_HERMES is not set

# CONFIG_ATMEL is not set

# CONFIG_AT76C50X_USB is not set

# CONFIG_PRISM54 is not set

# CONFIG_USB_ZD1201 is not set

# CONFIG_USB_NET_RNDIS_WLAN is not set
@@ -800,20 +815,20 @@ CONFIG_LIBERTAS_SDIO=y 
# CONFIG_RTL8187 is not set

# CONFIG_ADM8211 is not set

# CONFIG_MAC80211_HWSIM is not set

# CONFIG_MWL8K is not set

# CONFIG_P54_COMMON is not set

# CONFIG_ATH5K is not set

# CONFIG_ATH9K is not set

# CONFIG_AR9170_USB is not set

# CONFIG_IPW2100 is not set

# CONFIG_IPW2200 is not set

# CONFIG_IWLCORE is not set

# CONFIG_IWLWIFI_LEDS is not set

# CONFIG_IWLAGN is not set

# CONFIG_IWL3945 is not set

# CONFIG_IWLWIFI is not set

# CONFIG_HOSTAP is not set

# CONFIG_B43 is not set

# CONFIG_B43LEGACY is not set

# CONFIG_ZD1211RW is not set

# CONFIG_RT2X00 is not set

# CONFIG_HERMES is not set



#

# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -908,6 +923,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2 
#

# Non-8250 serial port support

#

# CONFIG_SERIAL_MAX3100 is not set

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set
@@ -982,7 +998,6 @@ CONFIG_I2C_MV64XXX=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set
@@ -1082,15 +1097,17 @@ CONFIG_USB_HID=y 
#

# Special HID drivers

#

CONFIG_HID_COMPAT=y

CONFIG_HID_A4TECH=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y

CONFIG_HID_CHERRY=y

CONFIG_HID_CHICONY=y

CONFIG_HID_CYPRESS=y

# CONFIG_DRAGONRISE_FF is not set

CONFIG_HID_EZKEY=y

CONFIG_HID_KYE=y

CONFIG_HID_GYRATION=y

CONFIG_HID_KENSINGTON=y

CONFIG_HID_LOGITECH=y

# CONFIG_LOGITECH_FF is not set

# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1152,11 +1169,11 @@ CONFIG_USB_PRINTER=m 
# CONFIG_USB_TMC is not set



#

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may

#



#

# see USB_STORAGE Help for more information

# also be needed; see USB_STORAGE Help for more info

#

CONFIG_USB_STORAGE=y

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1198,7 +1215,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y 
# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGET is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_FTDI_ELAN is not set

# CONFIG_USB_APPLEDISPLAY is not set
@@ -1215,6 +1231,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y 
# OTG and related infrastructure

#

# CONFIG_USB_GPIO_VBUS is not set

# CONFIG_NOP_USB_XCEIV is not set

# CONFIG_UWB is not set

CONFIG_MMC=y

# CONFIG_MMC_DEBUG is not set
@@ -1245,7 +1262,11 @@ CONFIG_LEDS_CLASS=y 
#

# CONFIG_LEDS_PCA9532 is not set

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_GPIO_PLATFORM=y

# CONFIG_LEDS_LP5521 is not set

# CONFIG_LEDS_PCA955X is not set

# CONFIG_LEDS_DAC124S085 is not set

# CONFIG_LEDS_BD2802 is not set



#

# LED Triggers
@@ -1255,6 +1276,10 @@ CONFIG_LEDS_TRIGGER_TIMER=y 
CONFIG_LEDS_TRIGGER_HEARTBEAT=y

# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y



#

# iptables trigger is under Netfilter config (LED target)

#

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_HCTOSYS=y
@@ -1329,7 +1354,9 @@ CONFIG_DMA_ENGINE=y 
# DMA Clients

#

# CONFIG_NET_DMA is not set

# CONFIG_ASYNC_TX_DMA is not set

# CONFIG_DMATEST is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_REGULATOR is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set
@@ -1341,6 +1368,7 @@ CONFIG_EXT2_FS=y 
# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

# CONFIG_EXT3_FS_XATTR is not set

# CONFIG_EXT4_FS is not set

CONFIG_JBD=y
@@ -1360,6 +1388,11 @@ CONFIG_INOTIFY_USER=y 
# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set



#

# Caches

#

# CONFIG_FSCACHE is not set



#

# CD-ROM/DVD Filesystems

#
@@ -1419,6 +1452,7 @@ CONFIG_CRAMFS=y 
# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y
@@ -1430,7 +1464,6 @@ CONFIG_LOCKD=y 
CONFIG_LOCKD_V4=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

# CONFIG_SUNRPC_REGISTER_V4 is not set

# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set
@@ -1502,6 +1535,9 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set

CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set

CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0

# CONFIG_SCHED_DEBUG is not set

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set
@@ -1538,10 +1574,12 @@ CONFIG_DEBUG_MEMORY_INIT=y 
# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_PAGE_POISONING is not set

CONFIG_NOP_TRACER=y

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_RING_BUFFER=y

CONFIG_TRACING=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers
@@ -1551,11 +1589,15 @@ CONFIG_TRACING=y 
# CONFIG_PREEMPT_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_FTRACE_STARTUP_TEST is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_DYNAMIC_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set
@@ -1587,10 +1629,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y 
CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_HASH2=y

CONFIG_CRYPTO_RNG2=y

CONFIG_CRYPTO_PCOMP=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_MANAGER2=y

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_NULL is not set

CONFIG_CRYPTO_WORKQUEUE=y

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_TEST is not set
@@ -1659,6 +1703,7 @@ CONFIG_CRYPTO_ARC4=y 
# Compression

#

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_ZLIB is not set

# CONFIG_CRYPTO_LZO is not set



#
@@ -1667,6 +1712,7 @@ CONFIG_CRYPTO_ARC4=y 
# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_HW=y

# CONFIG_CRYPTO_DEV_HIFN_795X is not set

CONFIG_BINARY_PRINTF=y



#

# Library routines
@@ -1682,7 +1728,7 @@ CONFIG_CRC32=y 
CONFIG_LIBCRC32C=y

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_PLIST=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_NLATTR=y

arch/arm/configs/mv78xx0_defconfig

+335 −94

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/orion5x_defconfig

+279 −84

File changed.

Preview size limit exceeded, changes collapsed.