remove iop-fix-iop_getttimeoffset.patch from queue-2.6.20 (doesn't apply,

author didn't reply to request for refresh for 2.6.20).

diff --git a/queue-2.6.20/iop-fix-iop_getttimeoffset.patch b/queue-2.6.20/iop-fix-iop_getttimeoffset.patch
deleted file mode 100644 (file)
index ab10f5d..0000000
--- a/queue-2.6.20/iop-fix-iop_getttimeoffset.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From stable-bounces@linux.kernel.org  Wed May  2 11:45:45 2007
-From: Dan Williams <dan.j.williams@intel.com>
-To: stable@kernel.org
-Date: Wed, 02 May 2007 11:43:14 -0700
-Message-ID: <20070502184314.10289.8158.stgit@dwillia2-linux.ch.intel.com>
-Cc: rmk@arm.linux.org.uk
-Subject: [stable] [PATCH 1/2] iop: fix iop_getttimeoffset
-
-Fix a typo which causes a necessary cpwait to be missed on iop3xx, Michael
-Brunner <mibru@gmx.de>
-
-Save a register in the assembly routine, rmk
-
-Cc: Lennert Buytenhek <kernel@wantstofly.org>
-Cc: Russell King <rmk+kernel@arm.linux.org.uk>
-Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-Signed-off-by: Chris Wright <chrisw@sous-sol.org>
----
-
- arch/arm/plat-iop/time.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c
-index 16300ad..0cc26da 100644
---- a/arch/arm/plat-iop/time.c
-+++ b/arch/arm/plat-iop/time.c
-@@ -32,22 +32,22 @@ static unsigned long next_jiffy_time;
- 
- unsigned long iop_gettimeoffset(void)
- {
--      unsigned long offset, temp1, temp2;
-+      unsigned long offset, temp;
- 
-       /* enable cp6, if necessary, to avoid taking the overhead of an
-        * undefined instruction trap
-        */
-       asm volatile (
-       "mrc    p15, 0, %0, c15, c1, 0\n\t"
--      "ands   %1, %0, #(1 << 6)\n\t"
-+      "tst    %0, #(1 << 6)\n\t"
-       "orreq  %0, %0, #(1 << 6)\n\t"
-       "mcreq  p15, 0, %0, c15, c1, 0\n\t"
--#ifdef CONFIG_XSCALE
-+#ifdef CONFIG_CPU_XSCALE
-       "mrceq  p15, 0, %0, c15, c1, 0\n\t"
-       "moveq  %0, %0\n\t"
-       "subeq  pc, pc, #4\n\t"
- #endif
--      : "=r"(temp1), "=r"(temp2) : : "cc");
-+      : "=r"(temp) : : "cc");
- 
-       offset = next_jiffy_time - read_tcr1();
- 

diff --git a/queue-2.6.20/series b/queue-2.6.20/series
index 7830fa31daba54f8e71d4984da5fcac095d124ad..0ecdf15060835eaff7bc3c441a62f30792e71b7b 100644 (file)
--- a/queue-2.6.20/series
+++ b/queue-2.6.20/series
@@ -10,4 +10,3 @@ jfs-fix-race-waking-up-jfsio-kernel-thread.patch
 crypto-api-read-module-pointer-before-freeing-algorithm.patch
 fuse-fix-mknod-of-regular-file.patch
 acpi-thermal-fix-mod_timer-interval.patch
-iop-fix-iop_getttimeoffset.patch