Commit f3d90716 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 6dfce901 5d3a8cd3
...@@ -913,6 +913,12 @@ M: mchan@broadcom.com ...@@ -913,6 +913,12 @@ M: mchan@broadcom.com
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Supported S: Supported
BSG (block layer generic sg v4 driver)
P: FUJITA Tomonori
M: fujita.tomonori@lab.ntt.co.jp
L: linux-scsi@vger.kernel.org
S: Supported
BTTV VIDEO4LINUX DRIVER BTTV VIDEO4LINUX DRIVER
P: Mauro Carvalho Chehab P: Mauro Carvalho Chehab
M: mchehab@infradead.org M: mchehab@infradead.org
......
...@@ -52,11 +52,16 @@ config LSF ...@@ -52,11 +52,16 @@ config LSF
endif # BLOCK endif # BLOCK
config BLK_DEV_BSG config BLK_DEV_BSG
bool "Block layer SG support" bool "Block layer SG support v4 (EXPERIMENTAL)"
depends on (SCSI=y) && EXPERIMENTAL depends on (SCSI=y) && EXPERIMENTAL
default y
---help--- ---help---
Saying Y here will enable generic SG (SCSI generic) v4 Saying Y here will enable generic SG (SCSI generic) v4 support
support for any block device. for any block device.
Unlike SG v3 (aka block/scsi_ioctl.c drivers/scsi/sg.c), SG v4
can handle complicated SCSI commands: tagged variable length cdbs
with bidirectional data transfers and generic request/response
protocols (e.g. Task Management Functions and SMP in Serial
Attached SCSI).
source block/Kconfig.iosched source block/Kconfig.iosched
This diff is collapsed.
...@@ -60,7 +60,6 @@ struct bsg_class_device { ...@@ -60,7 +60,6 @@ struct bsg_class_device {
extern int bsg_register_queue(struct request_queue *, const char *); extern int bsg_register_queue(struct request_queue *, const char *);
extern void bsg_unregister_queue(struct request_queue *); extern void bsg_unregister_queue(struct request_queue *);
#else #else
struct bsg_class_device { };
#define bsg_register_queue(disk, name) (0) #define bsg_register_queue(disk, name) (0)
#define bsg_unregister_queue(disk) do { } while (0) #define bsg_unregister_queue(disk) do { } while (0)
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment