| Index: chromeos/config/armel/config.common.armel
|
| diff --git a/chromeos/config/armel/config.common.armel b/chromeos/config/armel/config.common.armel
|
| index a48ac1aff24f1dc84e0699b75c8b30bd1e26e879..90d993829cd330f5cc7de541aa012b97f094067a 100644
|
| --- a/chromeos/config/armel/config.common.armel
|
| +++ b/chromeos/config/armel/config.common.armel
|
| @@ -63,12 +63,10 @@ CONFIG_ARM_UNWIND=y
|
| # CONFIG_BINFMT_MISC is not set
|
| # CONFIG_BLK_DEV_BSG is not set
|
| CONFIG_BLK_DEV_INITRD=y
|
| -# CONFIG_BLK_DEV_IO_TRACE is not set
|
| -# CONFIG_BOOT_TRACER is not set
|
| -CONFIG_BRANCH_PROFILE_NONE=y
|
| CONFIG_BROKEN_ON_SMP=y
|
| # CONFIG_BSD_PROCESS_ACCT is not set
|
| # CONFIG_BT_HCIBTSDIO is not set
|
| +# CONFIG_CFG80211_DEBUGFS is not set
|
| # CONFIG_CGROUPS is not set
|
| # CONFIG_CIFS is not set
|
| # CONFIG_CODA_FS is not set
|
| @@ -106,7 +104,6 @@ CONFIG_CRYPTO_RNG2=m
|
| CONFIG_CRYPTO_WORKQUEUE=m
|
| CONFIG_DEBUG_BUGVERBOSE=y
|
| # CONFIG_DEBUG_DEVRES is not set
|
| -# CONFIG_DEBUG_FS is not set
|
| # CONFIG_DEBUG_ICEDCC is not set
|
| CONFIG_DEBUG_INFO=y
|
| CONFIG_DEBUG_LL=y
|
| @@ -129,7 +126,6 @@ CONFIG_DNOTIFY=y
|
| # CONFIG_EEPROM_AT24 is not set
|
| # CONFIG_EEPROM_LEGACY is not set
|
| # CONFIG_EMBEDDED is not set
|
| -# CONFIG_ENABLE_DEFAULT_TRACERS is not set
|
| CONFIG_ENABLE_WARN_DEPRECATED=y
|
| # CONFIG_ETHOC is not set
|
| # CONFIG_EXT3_FS is not set
|
| @@ -141,8 +137,6 @@ CONFIG_FLATMEM=y
|
| CONFIG_FLATMEM_MANUAL=y
|
| CONFIG_FLAT_NODE_MEM_MAP=y
|
| CONFIG_FRAME_WARN=1024
|
| -CONFIG_FTRACE=y
|
| -# CONFIG_FUNCTION_TRACER is not set
|
| # CONFIG_FUSE_FS is not set
|
| # CONFIG_GROUP_SCHED is not set
|
| CONFIG_HARDIRQS_SW_RESEND=y
|
| @@ -180,10 +174,10 @@ CONFIG_INITRAMFS_SOURCE=""
|
| # CONFIG_KEYBOARD_SUNKBD is not set
|
| # CONFIG_KEYBOARD_XTKBD is not set
|
| # CONFIG_KEYS is not set
|
| -# CONFIG_KMEMTRACE is not set
|
| # CONFIG_LIBCRC32C is not set
|
| CONFIG_LOCALVERSION_AUTO=y
|
| CONFIG_LOG_BUF_SHIFT=17
|
| +# CONFIG_MAC80211_DEBUGFS is not set
|
| # CONFIG_MD is not set
|
| # CONFIG_MEDIA_SUPPORT is not set
|
| # CONFIG_NCP_FS is not set
|
| @@ -213,8 +207,6 @@ CONFIG_PAGE_OFFSET=0xC0000000
|
| CONFIG_PREEMPT=y
|
| # CONFIG_PREEMPT_VOLUNTARY is not set
|
| # CONFIG_PRINTK_TIME is not set
|
| -# CONFIG_PROFILE_ALL_BRANCHES is not set
|
| -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
|
| # CONFIG_PROFILING is not set
|
| CONFIG_RD_BZIP2=y
|
| CONFIG_RD_GZIP=y
|
| @@ -224,7 +216,6 @@ CONFIG_RD_LZMA=y
|
| # CONFIG_RTC_CLASS is not set
|
| CONFIG_RWSEM_GENERIC_SPINLOCK=y
|
| CONFIG_SCHED_DEBUG=y
|
| -# CONFIG_SCHED_TRACER is not set
|
| # CONFIG_SECURITY is not set
|
| # CONFIG_SECURITYFS is not set
|
| # CONFIG_SECURITY_FILE_CAPABILITIES is not set
|
| @@ -238,7 +229,6 @@ CONFIG_SLAB=y
|
| # CONFIG_SPARSEMEM_MANUAL is not set
|
| # CONFIG_SPI is not set
|
| # CONFIG_SQUASHFS is not set
|
| -# CONFIG_STACK_TRACER is not set
|
| CONFIG_SWAP=y
|
| # CONFIG_SYN_COOKIES is not set
|
| # CONFIG_SYSVIPC is not set
|
| @@ -274,6 +264,5 @@ CONFIG_VECTORS_BASE=0xffff0000
|
| CONFIG_VERSION_SIGNATURE=""
|
| # CONFIG_VGA_CONSOLE is not set
|
| CONFIG_VMSPLIT_3G=y
|
| -# CONFIG_WORKQUEUE_TRACER is not set
|
| # CONFIG_XIP_KERNEL is not set
|
| CONFIG_ZONE_DMA_FLAG=0
|
|
|