diff options
| author | Richard Henderson <rth@dorothy.sfbay.redhat.com> | 2003-02-18 02:25:48 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@dorothy.sfbay.redhat.com> | 2003-02-18 02:25:48 -0800 |
| commit | cc3cd601dabce508ebd5eb0dd820edb2736cf1b4 (patch) | |
| tree | 08bf48885878c08ff1aa8dc969d890b19bcc2d3f /include | |
| parent | 6aa909bef3009a7b3c4548c3d4b91b796c89b73c (diff) | |
| parent | 2f3c289f597db513457baa65ba4bf818bf937f75 (diff) | |
Merge dorothy.sfbay.redhat.com:/dorothy/rth/linux/linus-2.5
into dorothy.sfbay.redhat.com:/dorothy/rth/linux/axp-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/ide.h | 2 | ||||
| -rw-r--r-- | include/asm-alpha/posix_types.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h index 62d620539a07..bf5b19788cd9 100644 --- a/include/asm-alpha/ide.h +++ b/include/asm-alpha/ide.h @@ -80,6 +80,8 @@ static __inline__ void ide_init_default_hwifs(void) #endif } +#include <asm-generic/ide_iops.h> + #endif /* __KERNEL__ */ #endif /* __ASMalpha_IDE_H */ diff --git a/include/asm-alpha/posix_types.h b/include/asm-alpha/posix_types.h index ae871df5cefa..723efbe8a5ed 100644 --- a/include/asm-alpha/posix_types.h +++ b/include/asm-alpha/posix_types.h @@ -28,6 +28,8 @@ typedef char * __kernel_caddr_t; typedef unsigned long __kernel_sigset_t; /* at least 32 bits */ typedef unsigned short __kernel_uid16_t; typedef unsigned short __kernel_gid16_t; +typedef int __kernel_clockid_t; +typedef int __kernel_timer_t; typedef struct { int val[2]; |