aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/configs/pnx8550-v2pci_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-13 11:37:38 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-13 11:37:38 -0700
commitb174ec2c65d7fa13c88085a04670ac015fd9eb2e (patch)
tree83f096a470c050c406f4ff7fab07e4fa7577fd60 /arch/mips/configs/pnx8550-v2pci_defconfig
parent8b9909ded6922c33c221b105b26917780cfa497d (diff)
parent0e6ee854e7be9f12146c35aa09da3fe366d60f8c (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] kspd: ioctl needs a translation entry. [MIPS] Viper2: Remove defective support. [MIPS] Oprofile: Reset all performance registers for MIPS_MT_SMP configs
Diffstat (limited to 'arch/mips/configs/pnx8550-v2pci_defconfig')
-rw-r--r--arch/mips/configs/pnx8550-v2pci_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
index 43f1becec2a..3d6c2d74350 100644
--- a/arch/mips/configs/pnx8550-v2pci_defconfig
+++ b/arch/mips/configs/pnx8550-v2pci_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=y
# CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_STB810 is not set
# CONFIG_DDB5477 is not set