projects
/
linux-block.git
/ 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/scsi-misc-2.6
[linux-block.git]
/
arch
/
mips
/
defconfig
diff --git
a/arch/mips/defconfig
b/arch/mips/defconfig
index 8cb8f591919434056a424943920eb7e9a3a1afb9..41211f8b77384c0e3409aab920c444349f860aa7 100644
(file)
--- a/
arch/mips/defconfig
+++ b/
arch/mips/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