From 0dcd653dffe428645aaa41d0d900fc7c9c7f1c51 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Thu, 7 Sep 2006 08:25:40 -0500 Subject: [PATCH] --- yaml --- r: 34102 b: refs/heads/master c: 06e6d290ac7a9fb6fcec3a2207988163709f06aa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ppc/Kconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 10c124e6ba03..9b76bb179a97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57852a853b0d6761f270be0961d5d8387e98c8bb +refs/heads/master: 06e6d290ac7a9fb6fcec3a2207988163709f06aa diff --git a/trunk/arch/ppc/Kconfig b/trunk/arch/ppc/Kconfig index a04cdf01596b..8fa10cf661a8 100644 --- a/trunk/arch/ppc/Kconfig +++ b/trunk/arch/ppc/Kconfig @@ -1204,7 +1204,7 @@ config PCI_DOMAINS default PCI config MPC83xx_PCI2 - bool " Supprt for 2nd PCI host controller" + bool "Support for 2nd PCI host controller" depends on PCI && MPC834x default y if MPC834x_SYS @@ -1223,12 +1223,12 @@ config PCI_8260 default y config 8260_PCI9 - bool " Enable workaround for MPC826x erratum PCI 9" + bool "Enable workaround for MPC826x erratum PCI 9" depends on PCI_8260 && !ADS8272 default y choice - prompt " IDMA channel for PCI 9 workaround" + prompt "IDMA channel for PCI 9 workaround" depends on 8260_PCI9 config 8260_PCI9_IDMA1