diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 18:26:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 18:26:31 -0400 |
| commit | f3d9071667752e5d419e59f76912ed3fb4a6bb9c (patch) | |
| tree | e8787124dbe9bdd7e12d7c427c9ee6036cbe7783 /include | |
| parent | 6dfce901a450534d046b7950682243d5fb665783 (diff) | |
| parent | 5d3a8cd34beb1521a2697c6ed7b647ef9bafdbf1 (diff) | |
Merge branch 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block
* 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block:
bsg: fix missing space in version print
Don't define empty struct bsg_class_device if !CONFIG_BLK_DEV_BSG
bsg: Kconfig updates
bsg: minor cleanup
bsg: device hash table cleanup
bsg: fix initialization error handling bugs
bsg: mark FUJITA Tomonori as bsg maintainer
bsg: convert to dynamic major
bsg: address various review comments
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bsg.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/bsg.h b/include/linux/bsg.h index bd998ca6cb2e..8547b10c388b 100644 --- a/include/linux/bsg.h +++ b/include/linux/bsg.h | |||
| @@ -60,7 +60,6 @@ struct bsg_class_device { | |||
| 60 | extern int bsg_register_queue(struct request_queue *, const char *); | 60 | extern int bsg_register_queue(struct request_queue *, const char *); |
| 61 | extern void bsg_unregister_queue(struct request_queue *); | 61 | extern void bsg_unregister_queue(struct request_queue *); |
| 62 | #else | 62 | #else |
| 63 | struct bsg_class_device { }; | ||
| 64 | #define bsg_register_queue(disk, name) (0) | 63 | #define bsg_register_queue(disk, name) (0) |
| 65 | #define bsg_unregister_queue(disk) do { } while (0) | 64 | #define bsg_unregister_queue(disk) do { } while (0) |
| 66 | #endif | 65 | #endif |