diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-04 18:32:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-04 18:32:32 -0700 |
| commit | 5e1159759461b03f131bc6b7d5fb02cf2def99d7 (patch) | |
| tree | 669942057f0e66c5063df5d264f9098d983ddd5f /include | |
| parent | 84d58710feb87cde414ced92e55be2dff5660a4a (diff) | |
| parent | 98e6f1098d22f87640a96312d3024ffb8ca467f3 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-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 | ||||
| -rw-r--r-- | include/linux/blkdev.h | 1 |
3 files changed, 12 insertions, 4 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__) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 03691501d68f..fd211093a374 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -431,7 +431,6 @@ extern void blk_queue_max_hw_segments(request_queue_t *, unsigned short); extern void blk_queue_max_segment_size(request_queue_t *, unsigned int); extern void blk_queue_hardsect_size(request_queue_t *, unsigned short); extern void blk_queue_segment_boundary(request_queue_t *, unsigned long); -extern void blk_queue_assign_lock(request_queue_t *, spinlock_t *); extern void blk_queue_prep_rq(request_queue_t *, prep_rq_fn *pfn); extern void blk_queue_merge_bvec(request_queue_t *, merge_bvec_fn *); extern void blk_queue_dma_alignment(request_queue_t *, int); |