remove arm patch that did not apply

diff --git a/queue-3.3/arm-at91-dts-usb-host-vbus-is-active-low.patch b/queue-3.3/arm-at91-dts-usb-host-vbus-is-active-low.patch
deleted file mode 100644 (file)
index 6bf7312..0000000
--- a/queue-3.3/arm-at91-dts-usb-host-vbus-is-active-low.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 74adcb210685e7191425b6203e67c08d759412fa Mon Sep 17 00:00:00 2001
-From: Nicolas Ferre <nicolas.ferre@atmel.com>
-Date: Wed, 21 Mar 2012 14:48:23 +0100
-Subject: ARM: at91/dts: USB host vbus is active low
-
-From: Nicolas Ferre <nicolas.ferre@atmel.com>
-
-commit 74adcb210685e7191425b6203e67c08d759412fa upstream.
-
-Change vbus gpio configuration in .dts files to switch to
-active low configuration.
-
-Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
---- a/arch/arm/boot/dts/at91sam9g25ek.dts
-+++ b/arch/arm/boot/dts/at91sam9g25ek.dts
-@@ -37,8 +37,8 @@
-               usb0: ohci@00600000 {
-                       status = "okay";
-                       num-ports = <2>;
--                      atmel,vbus-gpio = <&pioD 19 0
--                                         &pioD 20 0
-+                      atmel,vbus-gpio = <&pioD 19 1
-+                                         &pioD 20 1
-                                         >;
-               };
- 
-diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
-index c4c8ae4..6abb571 100644
---- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
-+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
-@@ -73,8 +73,8 @@
-               usb0: ohci@00700000 {
-                       status = "okay";
-                       num-ports = <2>;
--                      atmel,vbus-gpio = <&pioD 1 0
--                                         &pioD 3 0>;
-+                      atmel,vbus-gpio = <&pioD 1 1
-+                                         &pioD 3 1>;
-               };
- 
-               usb1: ehci@00800000 {

diff --git a/queue-3.3/series b/queue-3.3/series
index 09ac8062b7bcbac25dcb8f0cfb38a2a43f801138..c14fa2c4b24e26bbc790da3a7aefcfd4952062cb 100644 (file)
--- a/queue-3.3/series
+++ b/queue-3.3/series
@@ -51,4 +51,3 @@ x86-kgdb-fix-debug_rodata-limitation-using-text_poke.patch
 cifs-fix-vfs-lock-usage-for-oplocked-files.patch
 usb-ohci-at91-fix-vbus_pin_active_low-handling.patch
 arm-at91-usb-host-specify-and-handle-properly-vbus_pin_active_low.patch
-arm-at91-dts-usb-host-vbus-is-active-low.patch