diff options
| author | David Woodhouse | 2005-07-02 14:39:09 +0200 |
|---|---|---|
| committer | David Woodhouse | 2005-07-02 14:39:09 +0200 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /arch/s390/kernel/compat_linux.h | |
| parent | AUDIT: Use KERN_NOTICE for printk of audit records (diff) | |
| parent | [PATCH] alpha smp fix (part #2) (diff) | |
| download | kernel-qcow2-linux-d2f6409584e2c62ffad81690562330ff3bf4a458.tar.gz kernel-qcow2-linux-d2f6409584e2c62ffad81690562330ff3bf4a458.tar.xz kernel-qcow2-linux-d2f6409584e2c62ffad81690562330ff3bf4a458.zip | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/s390/kernel/compat_linux.h')
| -rw-r--r-- | arch/s390/kernel/compat_linux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h index bf33dcfec7db..3898f66d0b2f 100644 --- a/arch/s390/kernel/compat_linux.h +++ b/arch/s390/kernel/compat_linux.h @@ -45,7 +45,7 @@ typedef struct compat_siginfo { /* POSIX.1b timers */ struct { - timer_t _tid; /* timer id */ + compat_timer_t _tid; /* timer id */ int _overrun; /* overrun count */ compat_sigval_t _sigval; /* same as below */ int _sys_private; /* not to be passed to user */ |