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 master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
configs
/
ddb5477_defconfig
diff --git
a/arch/mips/configs/ddb5477_defconfig
b/arch/mips/configs/ddb5477_defconfig
index f4b316d2cd707256ba62a709fdb7917c4b59ffe3..5b502a2013fb81d752df5c7a5f9f72480027bb33 100644
(file)
--- a/
arch/mips/configs/ddb5477_defconfig
+++ b/
arch/mips/configs/ddb5477_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=y