diff --git a/[refs] b/[refs]
index 0d6ea5d44c8b..39f9200f3c1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 714b720eff5ee7cf6a9f835007f9dfd5d4c68ae3
+refs/heads/master: 35122062bee3d6178dbcd383fa487b5b5f4d28bf
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index 9146b9d1170a..0e11a095a9d1 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/arch/powerpc/Kconfig
@@ -773,11 +773,6 @@ config PCI_8260
 	select PPC_INDIRECT_PCI
 	default y
 
-config 8260_PCI9
-	bool "Enable workaround for MPC826x erratum PCI 9"
-	depends on PCI_8260 && !8272
-	default y
-
 source "drivers/pci/pcie/Kconfig"
 
 source "drivers/pci/Kconfig"