diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 17:26:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 17:26:42 -0400 |
| commit | 07bbc16a8676b06950a21f35b59f69b2fe763bbd (patch) | |
| tree | f87fbfea747e9d92591c8d0a54db7c487e3c3d78 /include/linux/blkdev.h | |
| parent | 6a9e91846bf52cc70a0417de19fdfac224c435c4 (diff) | |
| parent | f8e256c687eb53850685747757c8d75e58756e15 (diff) | |
Merge branch 'timers/urgent' into x86/xen
Conflicts:
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
Manual merge:
arch/x86/kernel/smpboot.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 44710d7e7bff..53ea933cf60b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -843,8 +843,6 @@ extern int blkdev_issue_flush(struct block_device *, sector_t *); | |||
| 843 | */ | 843 | */ |
| 844 | extern int blk_verify_command(struct blk_cmd_filter *filter, | 844 | extern int blk_verify_command(struct blk_cmd_filter *filter, |
| 845 | unsigned char *cmd, int has_write_perm); | 845 | unsigned char *cmd, int has_write_perm); |
| 846 | extern int blk_register_filter(struct gendisk *disk); | ||
| 847 | extern void blk_unregister_filter(struct gendisk *disk); | ||
| 848 | extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter); | 846 | extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter); |
| 849 | 847 | ||
| 850 | #define MAX_PHYS_SEGMENTS 128 | 848 | #define MAX_PHYS_SEGMENTS 128 |