resync kernel configuration

SVN-Revision: 18538

1 files changed, 24 insertions, 24 deletions

diff --git a/target/linux/octeon/config-default b/target/linux/octeon/config-default
index 15ea51c6a1..3751a75bd8 100644
--- a/target/linux/octeon/config-default
+++ b/target/linux/octeon/config-default
@@ -1,9 +1,9 @@
 # CONFIG_32BIT is not set
-CONFIG_64BIT_PHYS_ADDR=y
 CONFIG_64BIT=y
+CONFIG_64BIT_PHYS_ADDR=y
 # CONFIG_ALTERA_PCIE_CHDMA is not set
-# CONFIG_ANDROID_BINDER_IPC is not set
 # CONFIG_ANDROID is not set
+# CONFIG_ANDROID_BINDER_IPC is not set
 # CONFIG_ANDROID_LOGGER is not set
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 # CONFIG_ANDROID_RAM_CONSOLE is not set
@@ -30,22 +30,22 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set
 CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2
 CONFIG_CAVIUM_OCTEON_HW_FIX_UNALIGNED=y
+CONFIG_CAVIUM_OCTEON_LOCK_L2=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_MEMCPY=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB=y
-CONFIG_CAVIUM_OCTEON_LOCK_L2=y
 CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD=y
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CAVIUM_OCTEON_SPECIFIC_OPTIONS=y
-CONFIG_CEVT_R4K_LIB=y
 CONFIG_CEVT_R4K=y
+CONFIG_CEVT_R4K_LIB=y
 # CONFIG_CGROUP_SCHED is not set
 CONFIG_CMDLINE="console=ttyS0,115200"
 # CONFIG_COMEDI is not set
-CONFIG_COMPAT_BRK=y
 CONFIG_COMPAT=y
+CONFIG_COMPAT_BRK=y
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_CAVIUM_OCTEON=y
 CONFIG_CPU_HAS_PREFETCH=y
@@ -83,8 +83,8 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_OBJECTS is not set
@@ -92,8 +92,8 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_SHIRQ is not set
 # CONFIG_DEBUG_SLAB is not set
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
@@ -116,8 +116,8 @@ CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FRAME_WARN=2048
 # CONFIG_FW_LOADER is not set
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -132,31 +132,31 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_SYSCALL_WRAPPERS=y
 # CONFIG_HECI is not set
 # CONFIG_HIGH_RES_TIMERS is not set
 CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM_OCTEON=y
 CONFIG_HW_RANDOM=y
-# CONFIG_HZ_100 is not set
+CONFIG_HW_RANDOM_OCTEON=y
 CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY=y
-CONFIG_IRQ_CPU_OCTEON=y
+CONFIG_INOTIFY_USER=y
 CONFIG_IRQ_CPU=y
+CONFIG_IRQ_CPU_OCTEON=y
 CONFIG_IRQ_PER_CPU=y
 # CONFIG_ISDN is not set
-# CONFIG_KALLSYMS_ALL is not set
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 CONFIG_KEXEC=y
 # CONFIG_KGDB is not set
-CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LEMOTE_FULONG is not set
 CONFIG_LOCK_KERNEL=y
 # CONFIG_LOCK_STAT is not set
@@ -170,6 +170,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_ME4000 is not set
 # CONFIG_MEILHAUS is not set
 # CONFIG_MIKROTIK_RB532 is not set
+CONFIG_MIPS=y
 CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_N32=y
 CONFIG_MIPS32_O32=y
@@ -182,7 +183,6 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set
-CONFIG_MIPS=y
 # CONFIG_MISC_DEVICES is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
@@ -207,20 +207,20 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_POHMELFS is not set
-CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RELAY=y
-# CONFIG_RT_GROUP_SCHED is not set
 # CONFIG_RTL8187SE is not set
+# CONFIG_RT_GROUP_SCHED is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_RUNTIME_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCHEDSTATS is not set
 # CONFIG_SCSI_DMA is not set
 CONFIG_SECCOMP=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -238,15 +238,16 @@ CONFIG_SECCOMP=y
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SMP=y
+CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM_STATIC=y
-CONFIG_SPARSEMEM=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
 CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_SWAP_IO_SPACE=y
-CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_SYSVIPC_COMPAT=y
 CONFIG_SYS_HAS_CPU_CAVIUM_OCTEON=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
@@ -254,14 +255,13 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_HIGHMEM=y
 CONFIG_SYS_SUPPORTS_SMP=y
-CONFIG_SYSVIPC_COMPAT=y
 # CONFIG_TC35815 is not set
 # CONFIG_TIMER_STATS is not set
 CONFIG_TRACING_SUPPORT=y
 CONFIG_UNEVICTABLE_LRU=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_USER_SCHED=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
 # CONFIG_VLAN_8021Q is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WEAK_ORDERING=y