diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 11:26:22 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 11:26:22 +0100 |
| commit | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (patch) | |
| tree | ceba46966a5a1112a05d257d8ecb25ae5eee95e0 /include/asm-arm26 | |
| parent | 364f6c717deef4a3ac4982e670fa9846b43cd060 (diff) | |
| parent | ee98689be1b054897ff17655008c3048fe88be94 (diff) | |
| download | kernel_samsung_tuna-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.zip kernel_samsung_tuna-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.tar.gz kernel_samsung_tuna-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.tar.bz2 | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/asm-arm26')
| -rw-r--r-- | include/asm-arm26/elf.h | 2 | ||||
| -rw-r--r-- | include/asm-arm26/signal.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-arm26/elf.h b/include/asm-arm26/elf.h index 8b14947..5a47fdb 100644 --- a/include/asm-arm26/elf.h +++ b/include/asm-arm26/elf.h @@ -36,7 +36,7 @@ typedef struct { void *null; } elf_fpregset_t; * These are used to set parameters in the core dumps. */ #define ELF_CLASS ELFCLASS32 -#define ELF_DATA ELFDATA2LSB; +#define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_ARM #define USE_ELF_CORE_DUMP diff --git a/include/asm-arm26/signal.h b/include/asm-arm26/signal.h index dedb292..37ad253 100644 --- a/include/asm-arm26/signal.h +++ b/include/asm-arm26/signal.h @@ -166,9 +166,6 @@ typedef struct sigaltstack { #include <asm/sigcontext.h> #define sigmask(sig) (1UL << ((sig) - 1)) -//FIXME!!! -//#define HAVE_ARCH_GET_SIGNAL_TO_DELIVER - #endif |