From 8783accc60e3c93af338b573ffe51458930b9e7d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 5 Jun 2011 19:20:03 +0000 Subject: [PATCH] [armel/iop32x] Fix FTBFS (Closes: #629342) svn path=/dists/trunk/linux-2.6/; revision=17596 --- debian/changelog | 3 +++ ...-iop-fixes-fail-to-build-from-source.patch | 27 +++++++++++++++++++ debian/patches/series/1~experimental.2 | 1 + 3 files changed, 31 insertions(+) create mode 100644 debian/patches/bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch create mode 100644 debian/patches/series/1~experimental.2 diff --git a/debian/changelog b/debian/changelog index 90e6f5c2d..28fccfd4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ linux-2.6 (3.0.0~rc1-1~experimental.2) experimental; urgency=low [ maximilian attems ] * Newer Standards-Version 3.9.2 without changes. + + [ Hector Oron ] + * [armel/iop32x] Fix FTBFS (Closes: #629342) -- Ben Hutchings Wed, 01 Jun 2011 06:41:14 +0100 diff --git a/debian/patches/bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch b/debian/patches/bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch new file mode 100644 index 000000000..a2536138f --- /dev/null +++ b/debian/patches/bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch @@ -0,0 +1,27 @@ +From: Hector Oron +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 +--- + 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 + #include ++#include + + static int cp6_trap(struct pt_regs *regs, unsigned int instr) + { +-- +1.7.4.1 + diff --git a/debian/patches/series/1~experimental.2 b/debian/patches/series/1~experimental.2 new file mode 100644 index 000000000..7c8e96be4 --- /dev/null +++ b/debian/patches/series/1~experimental.2 @@ -0,0 +1 @@ ++ bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch