summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/ddb5477_defconfig
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-04-13 03:50:03 +1000
committerPaul Mackerras <paulus@samba.org>2007-04-13 03:50:03 +1000
commite049d1ca3094f3d1d94617f456a9961202f96e3a (patch)
treea30397ad22f2fbea268bd28fa69c60aad9dfa62a /arch/mips/configs/ddb5477_defconfig
parentedfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff)
parent80584ff3b99c36ead7e130e453b3a48b18072d18 (diff)
downloadblackbird-op-linux-e049d1ca3094f3d1d94617f456a9961202f96e3a.tar.gz
blackbird-op-linux-e049d1ca3094f3d1d94617f456a9961202f96e3a.zip
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'arch/mips/configs/ddb5477_defconfig')
-rw-r--r--arch/mips/configs/ddb5477_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig
index f4b316d2cd70..5b502a2013fb 100644
--- 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
OpenPOWER on IntegriCloud