git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
configs
/
cavium-octeon_defconfig
diff --git
a/arch/mips/configs/cavium-octeon_defconfig
b/arch/mips/configs/cavium-octeon_defconfig
index 3567b6f07b37c6221a53a07f65ce1c53c26ea3d4..75165dfa60c10990216691c95c2f25530b0a1fdf 100644
(file)
--- a/
arch/mips/configs/cavium-octeon_defconfig
+++ b/
arch/mips/configs/cavium-octeon_defconfig
@@
-15,7
+15,7
@@
CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_E
MBEDDED
=y
+CONFIG_E
XPERT
=y
# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_SLAB=y
CONFIG_MODULES=y