summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 15:26:31 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 15:26:31 -0700
commitf3d9071667752e5d419e59f76912ed3fb4a6bb9c (patch)
treee8787124dbe9bdd7e12d7c427c9ee6036cbe7783 /include/linux
parent6dfce901a450534d046b7950682243d5fb665783 (diff)
parent5d3a8cd34beb1521a2697c6ed7b647ef9bafdbf1 (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/linux')
-rw-r--r--include/linux/bsg.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index bd998ca6cb2..8547b10c388 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -60,7 +60,6 @@ struct bsg_class_device {
extern int bsg_register_queue(struct request_queue *, const char *);
extern void bsg_unregister_queue(struct request_queue *);
#else
-struct bsg_class_device { };
#define bsg_register_queue(disk, name) (0)
#define bsg_unregister_queue(disk) do { } while (0)
#endif