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
/
arm
/
configs
/
stmp378x_defconfig
diff --git
a/arch/arm/configs/stmp378x_defconfig
b/arch/arm/configs/stmp378x_defconfig
index 94a2d904bf9408552118b6238466b158058e9154..1079c2b6eb3aacc3a3655a90c1e8454a8908f25d 100644
(file)
--- a/
arch/arm/configs/stmp378x_defconfig
+++ b/
arch/arm/configs/stmp378x_defconfig
@@
-5,7
+5,7
@@
CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_BLK_DEV_INITRD=y
-CONFIG_E
MBEDDED
=y
+CONFIG_E
XPERT
=y
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y