[kernel] r17596 - in dists/trunk/linux-2.6/debian: . patches/bugfix/arm patches/series

[Ben Hutchings]

Author: benh
Date: Sun Jun  5 19:20:03 2011
New Revision: 17596

Log:
[armel/iop32x] Fix FTBFS (Closes: #629342)

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
Modified:
   dists/trunk/linux-2.6/debian/changelog

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Jun  5 18:36:42 2011	(r17595)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Jun  5 19:20:03 2011	(r17596)
@@ -2,6 +2,9 @@
 
   [ maximilian attems ]
   * Newer Standards-Version 3.9.2 without changes.
+  
+  [ Hector Oron ]
+  * [armel/iop32x] Fix FTBFS (Closes: #629342)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 01 Jun 2011 06:41:14 +0100
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch	Sun Jun  5 19:20:03 2011	(r17596)
@@ -0,0 +1,27 @@
+From: Hector Oron <hector.oron at gmail.com>
+Date: Sun, 5 Jun 2011 19:24:09 +0100
+Subject: [PATCH] plat-iop: fixes fail to build from source
+
+  arch/arm/plat-iop/cp6.c:42: error: 'MODE_MASK' undeclared here (not in a function)
+  arch/arm/plat-iop/cp6.c:43: error: 'SVC_MODE' undeclared here (not in a function)
+
+Signed-off-by: Hector Oron <hector.oron at gmail.com>
+---
+ arch/arm/plat-iop/cp6.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/plat-iop/cp6.c b/arch/arm/plat-iop/cp6.c
+index 9612a87..bab73e2 100644
+--- a/arch/arm/plat-iop/cp6.c
++++ b/arch/arm/plat-iop/cp6.c
+@@ -18,6 +18,7 @@
+  */
+ #include <linux/init.h>
+ #include <asm/traps.h>
++#include <asm/ptrace.h>
+ 
+ static int cp6_trap(struct pt_regs *regs, unsigned int instr)
+ {
+-- 
+1.7.4.1
+

Added: dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.2	Sun Jun  5 19:20:03 2011	(r17596)
@@ -0,0 +1 @@
++ bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch