projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6
[linux-2.6]
/
arch
/
mips
/
configs
/
emma2rh_defconfig
diff --git
a/arch/mips/configs/emma2rh_defconfig
b/arch/mips/configs/emma2rh_defconfig
index
c0db8f1
..
3044579
100644
(file)
--- a/
arch/mips/configs/emma2rh_defconfig
+++ b/
arch/mips/configs/emma2rh_defconfig
@@
-39,7
+39,6
@@
CONFIG_ZONE_DMA=y
# CONFIG_MOMENCO_OCELOT_C is not set
# CONFIG_MOMENCO_OCELOT_G is not set
# CONFIG_MIPS_XXS1500 is not set
-# CONFIG_PNX8550_V2PCI is not set
# CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_STB810 is not set
# CONFIG_DDB5477 is not set