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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
configs
/
ip27_defconfig
diff --git
a/arch/mips/configs/ip27_defconfig
b/arch/mips/configs/ip27_defconfig
index 46f6ac4083b97ae6c82767e17b6b6f72a8707b03..9ddc3eff479391179d7740a3d234967575d361ca 100644
(file)
--- a/
arch/mips/configs/ip27_defconfig
+++ b/
arch/mips/configs/ip27_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