From: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Tue, 17 Jul 2007 12:18:47 +0000 (+0200)
Subject: Don't define empty struct bsg_class_device if !CONFIG_BLK_DEV_BSG
X-Git-Tag: v2.6.23-rc1~510^2~1
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=13bd59a111760bb7cba8dcf17b6b55a0d99d3592;p=linux-2.6-omap-h63xx.git

Don't define empty struct bsg_class_device if !CONFIG_BLK_DEV_BSG

Don't define an empty struct bsg_class_device if !CONFIG_BLK_DEV_BSG.

It's embedded in struct request_queue, but there we have

#if defined(CONFIG_BLK_DEV_BSG)
	struct bsg_class_device bsg_dev;
#endif

anyway.

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

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