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 'release', 'asus', 'sony-laptop' and 'thinkpad' into release
[pandora-kernel.git]
/
arch
/
mips
/
configs
/
emma2rh_defconfig
diff --git
a/arch/mips/configs/emma2rh_defconfig
b/arch/mips/configs/emma2rh_defconfig
index
f931bcb
..
f9a003c
100644
(file)
--- a/
arch/mips/configs/emma2rh_defconfig
+++ b/
arch/mips/configs/emma2rh_defconfig
@@
-37,7
+37,6
@@
CONFIG_ZONE_DMA=y
# CONFIG_PNX8550_STB810 is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_QEMU is not set
CONFIG_MARKEINS=y
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set