diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-04 18:26:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-04 18:26:39 -0700 |
| commit | 20189bf5c8551c7f37aae2f383dd959c8b257c47 (patch) | |
| tree | 18a4601f651963e520a285cf43219e558e7fb940 /include | |
| parent | 8a36b98fd0d80234db3675aca4d56e034b01d175 (diff) | |
| parent | 2473cc4f1022f84dc427822432e7d0c25d81c62e (diff) | |
Merge bk://are.twiddle.net/axp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/agp_backend.h | 4 | ||||
| -rw-r--r-- | include/asm-alpha/unistd.h | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/include/asm-alpha/agp_backend.h b/include/asm-alpha/agp_backend.h index 3998e2547545..55dd44a2cea7 100644 --- a/include/asm-alpha/agp_backend.h +++ b/include/asm-alpha/agp_backend.h @@ -33,8 +33,8 @@ struct alpha_agp_ops { int (*setup)(alpha_agp_info *); void (*cleanup)(alpha_agp_info *); int (*configure)(alpha_agp_info *); - int (*bind)(alpha_agp_info *, off_t, agp_memory *); - int (*unbind)(alpha_agp_info *, off_t, agp_memory *); + int (*bind)(alpha_agp_info *, off_t, struct agp_memory *); + int (*unbind)(alpha_agp_info *, off_t, struct agp_memory *); unsigned long (*translate)(alpha_agp_info *, dma_addr_t); }; diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h index d110fd3afb5a..494765bb1c92 100644 --- a/include/asm-alpha/unistd.h +++ b/include/asm-alpha/unistd.h @@ -349,7 +349,16 @@ #define __NR_set_tid_address 411 #define __NR_restart_syscall 412 #define __NR_fadvise64 413 -#define NR_SYSCALLS 414 +#define __NR_timer_create 414 +#define __NR_timer_settime 415 +#define __NR_timer_gettime 416 +#define __NR_timer_getoverrun 417 +#define __NR_timer_delete 418 +#define __NR_clock_settime 419 +#define __NR_clock_gettime 420 +#define __NR_clock_getres 421 +#define __NR_clock_nanosleep 422 +#define NR_SYSCALLS 423 #if defined(__GNUC__) |