summaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorRussell King <rmk@flint.arm.linux.org.uk>2002-11-24 23:15:00 +0000
committerRussell King <rmk@flint.arm.linux.org.uk>2002-11-24 23:15:00 +0000
commit3232cbcf6e6bc46579d54bd0fe65634d10eb7247 (patch)
treec1f0635696dae84f3f923874ce074aff4a9d8817 /include/asm-arm
parentcebce9d8beb7493d5c82035db854a475f6a1ae66 (diff)
[ARM] 2.5.49 Build fixes
- Fix include files in various drivers to kill warnings about free_irq() and request_irq() - Make ARM cpufreq files build - Convert arthur.c initialisers to C99 style, fixing an init bug. - Allow ARM binaries to execute on Thumb-capable CPUs again. - Remove arxescsi.h; it is no longer required.
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/proc-armv/elf.h2
-rw-r--r--include/asm-arm/suspend.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/proc-armv/elf.h b/include/asm-arm/proc-armv/elf.h
index b2cd010ee344..1b8a0ac3b2b5 100644
--- a/include/asm-arm/proc-armv/elf.h
+++ b/include/asm-arm/proc-armv/elf.h
@@ -13,7 +13,7 @@
#define ELF_THUMB_OK(x) \
(( (elf_hwcap & HWCAP_THUMB) && ((x)->e_entry & 1) == 1) || \
- (!(elf_hwcap & HWCAP_THUMB) && ((x)->e_entry & 3) == 0))
+ ((x)->e_entry & 3) == 0)
#define ELF_26BIT_OK(x) \
(( (elf_hwcap & HWCAP_26BIT) && (x)->e_flags & EF_ARM_APCS26) || \
diff --git a/include/asm-arm/suspend.h b/include/asm-arm/suspend.h
index 5e4c1cc0c19d..cf0d0bdee74d 100644
--- a/include/asm-arm/suspend.h
+++ b/include/asm-arm/suspend.h
@@ -1,4 +1,4 @@
-#ifdef _ASMARM_SUSPEND_H
+#ifndef _ASMARM_SUSPEND_H
#define _ASMARM_SUSPEND_H
#endif