diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-11 08:42:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-11 08:42:55 -0700 |
| commit | 6d242a263618ba7f0f9a41dd91b347d19e704bbe (patch) | |
| tree | 1c532ca96d543bd2335a5915d9c7646ffe776eba /include | |
| parent | a0a4a2cb0d69446c084792a40884d911dfc3cf27 (diff) | |
| parent | 2dc75d3c3b49c64fd26b4832a7efb75546cb3fc5 (diff) | |
| download | linux-6d242a263618ba7f0f9a41dd91b347d19e704bbe.tar.gz linux-6d242a263618ba7f0f9a41dd91b347d19e704bbe.tar.bz2 linux-6d242a263618ba7f0f9a41dd91b347d19e704bbe.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: disable sysfs parts of the disk command filter
Diffstat (limited to 'include')
| -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 *); */ extern int blk_verify_command(struct blk_cmd_filter *filter, unsigned char *cmd, int has_write_perm); -extern int blk_register_filter(struct gendisk *disk); -extern void blk_unregister_filter(struct gendisk *disk); extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter); #define MAX_PHYS_SEGMENTS 128 |