remove queue-3.10/arm-mvebu-re-enable-pcie-on-armada-370-db.patch

diff --git a/queue-3.10/arm-mvebu-re-enable-pcie-on-armada-370-db.patch b/queue-3.10/arm-mvebu-re-enable-pcie-on-armada-370-db.patch
deleted file mode 100644 (file)
index ccdf696..0000000
--- a/queue-3.10/arm-mvebu-re-enable-pcie-on-armada-370-db.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 96039f735e290281d0c8a08fc467de2cd610543d Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Mon, 25 Nov 2013 17:26:47 +0100
-Subject: ARM: mvebu: re-enable PCIe on Armada 370 DB
-
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-commit 96039f735e290281d0c8a08fc467de2cd610543d upstream.
-
-Commit 14fd8ed0a7fd19913 ("ARM: mvebu: Relocate Armada 370/XP PCIe
-device tree nodes") relocated the PCIe controller DT nodes one level
-up in the Device Tree, to reflect a more correct representation of the
-hardware introduced by the mvebu-mbus Device Tree binding.
-
-However, while most of the boards were properly adjusted accordingly,
-the Armada 370 DB board was left unchanged, and therefore, PCIe is
-seen as not enabled on this board. This patch fixes that by moving the
-PCIe controller node one level-up in armada-370-db.dts.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Fixes: 14fd8ed0a7fd19913 "ARM: mvebu: Relocate Armada 370/XP PCIe device tree nodes"
-Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/boot/dts/armada-370-db.dts |   28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
---- a/arch/arm/boot/dts/armada-370-db.dts
-+++ b/arch/arm/boot/dts/armada-370-db.dts
-@@ -95,22 +95,22 @@
-                                       spi-max-frequency = <50000000>;
-                               };
-                       };
-+              };
- 
--                      pcie-controller {
-+              pcie-controller {
-+                      status = "okay";
-+                      /*
-+                       * The two PCIe units are accessible through
-+                       * both standard PCIe slots and mini-PCIe
-+                       * slots on the board.
-+                       */
-+                      pcie@1,0 {
-+                              /* Port 0, Lane 0 */
-+                              status = "okay";
-+                      };
-+                      pcie@2,0 {
-+                              /* Port 1, Lane 0 */
-                               status = "okay";
--                              /*
--                               * The two PCIe units are accessible through
--                               * both standard PCIe slots and mini-PCIe
--                               * slots on the board.
--                               */
--                              pcie@1,0 {
--                                      /* Port 0, Lane 0 */
--                                      status = "okay";
--                              };
--                              pcie@2,0 {
--                                      /* Port 1, Lane 0 */
--                                      status = "okay";
--                              };
-                       };
-               };
-       };

diff --git a/queue-3.10/series b/queue-3.10/series
index ba6a0f0fa53e95a0d251a72771e040b1eba13fea..78827546e1b5379532f22fa6d2804aabb00aebe0 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -12,7 +12,6 @@ arm-footbridge-fix-vga-initialisation.patch
 arm-footbridge-fix-ebsa285-leds.patch
 arm-at91-sama5d3-reduce-twi-internal-clock-frequency.patch
 arm-mvebu-use-the-virtual-cpu-registers-to-access-coherency-registers.patch
-arm-mvebu-re-enable-pcie-on-armada-370-db.patch
 asoc-wm8990-mark-the-register-map-as-dirty-when-powering-down.patch
 asoc-wm8731-fix-dsp-mode-configuration.patch
 vfs-fix-subtle-use-after-free-of-pipe_inode_info.patch