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 branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh...
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
magician_defconfig
diff --git
a/arch/arm/configs/magician_defconfig
b/arch/arm/configs/magician_defconfig
index
af805e8
..
a88e64d
100644
(file)
--- a/
arch/arm/configs/magician_defconfig
+++ b/
arch/arm/configs/magician_defconfig
@@
-4,7
+4,7
@@
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=16
CONFIG_BLK_DEV_INITRD=y
-CONFIG_E
MBEDDED
=y
+CONFIG_E
XPERT
=y
# CONFIG_UID16 is not set
CONFIG_SLAB=y
CONFIG_MODULES=y