diable TOUCHSCREEN_EETI on all arm arches

- add patch for arm mtd
This commit is contained in:
Dennis Gilmore 2012-02-01 01:59:50 -06:00
parent c24ab00680
commit 4fc891d8e3
2 changed files with 31 additions and 0 deletions

28
arm-build-bug-on.patch Normal file
View File

@ -0,0 +1,28 @@
BUILD_BUG_ON is defined in linux/kernel.h but that is not included by the
asm/bug.h header which uses it. This causes a build error:
...include/linux/mtd/map.h: In function 'inline_map_read':
...include/linux/mtd/map.h:408:3: error: implicit declaration of function
'BUILD_BUG_ON' [-Werror=implicit-function-declaration]
The check is not essential and is not present for other architectures, so
just remove it.
Signed-off-by: Simon Glass <sjg <at> chromium.org>
---
arch/arm/include/asm/bug.h | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/include/asm/bug.h b/arch/arm/include/asm/bug.h
index 9abe7a0..fac79dc 100644
--- a/arch/arm/include/asm/bug.h
+++ b/arch/arm/include/asm/bug.h
@@ -32,7 +32,6 @@
#define __BUG(__file, __line, __value) \
do { \
- BUILD_BUG_ON(sizeof(struct bug_entry) != 12); \
asm volatile("1:\t" BUG_INSTR_TYPE #__value "\n" \
".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \
"2:\t.asciz " #__file "\n" \
--

View File

@ -655,6 +655,7 @@ Patch20000: utrace.patch
# Flattened devicetree support
Patch21000: arm-omap-dt-compat.patch
Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
Patch21002: arm-build-bug-on.patch
#rhbz 717735
Patch21045: nfs-client-freezer.patch
@ -1134,6 +1135,7 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
#
ApplyPatch arm-omap-dt-compat.patch
ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
ApplyPatch arm-build-bug-on.patch
ApplyPatch taint-vbox.patch
#
@ -1961,6 +1963,7 @@ fi
%changelog
* Tue Jan 31 2012 Dennis Gilmore <dennis@ausil.us>
- diable TOUCHSCREEN_EETI on all arm arches
- add patch for arm mtd
* Mon Jan 30 2012 Dave Jones <davej@redhat.com>
- Enable kmemleak (off by default) in kernel-debug (rhbz 782419)