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
/
u300_defconfig
diff --git
a/arch/arm/configs/u300_defconfig
b/arch/arm/configs/u300_defconfig
index c1c252cdca60702334e1f6e0abae37836c5b7462..4a5a12681be2038c908318ffc953c3ad7a9bd431 100644
(file)
--- a/
arch/arm/configs/u300_defconfig
+++ b/
arch/arm/configs/u300_defconfig
@@
-3,7
+3,7
@@
CONFIG_EXPERIMENTAL=y
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_LOG_BUF_SHIFT=14
-CONFIG_E
MBEDDED
=y
+CONFIG_E
XPERT
=y
# CONFIG_AIO is not set
# CONFIG_VM_EVENT_COUNTERS is not set
CONFIG_MODULES=y