git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into...
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
collie_defconfig
diff --git
a/arch/arm/configs/collie_defconfig
b/arch/arm/configs/collie_defconfig
index
310f9a6
..
6c56ad0
100644
(file)
--- a/
arch/arm/configs/collie_defconfig
+++ b/
arch/arm/configs/collie_defconfig
@@
-4,7
+4,7
@@
CONFIG_SYSVIPC=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_BLK_DEV_INITRD=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_E
MBEDDED
=y
+CONFIG_E
XPERT
=y
# CONFIG_BASE_FULL is not set
# CONFIG_EPOLL is not set
CONFIG_SLOB=y