[SCSI] bsg: Fix build for CONFIG_BLOCK=n

2007-07-29 Thread Linux Kernel Mailing List
Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=99d4d0a9f251a87e0710c6f1fb46ac0d4bce12cb
Commit: 99d4d0a9f251a87e0710c6f1fb46ac0d4bce12cb
Parent: 9859c1aa7e16822c574e1be89d61fbfe6188b50f
Author: Paul Mundt [EMAIL PROTECTED]
AuthorDate: Sat Jul 28 23:45:43 2007 +0900
Committer:  James Bottomley [EMAIL PROTECTED]
CommitDate: Sat Jul 28 10:56:06 2007 -0400

[SCSI] bsg: Fix build for CONFIG_BLOCK=n

BLK_DEV_BSG was added outside of the if BLOCK check, which allows it to
be enabled when CONFIG_BLOCK=n. This leads to many screenlengths of
errors, starting with a parse error on the request_queue_t definition.
Obviously this wasn't intended for CONFIG_BLOCK=n usage, so just move the
option back in to the block.

Caught with a randconfig on sh.

Signed-off-by: Paul Mundt [EMAIL PROTECTED]
Acked-by: Jens Axboe [EMAIL PROTECTED]
Acked-by: FUJITA Tomonori [EMAIL PROTECTED]
Signed-off-by: James Bottomley [EMAIL PROTECTED]
---
 block/Kconfig |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/Kconfig b/block/Kconfig
index ca2ef4e..2484e0e 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -49,8 +49,6 @@ config LSF
 
  If unsure, say Y.
 
-endif # BLOCK
-
 config BLK_DEV_BSG
bool Block layer SG support v4 (EXPERIMENTAL)
depends on EXPERIMENTAL
@@ -64,4 +62,6 @@ config BLK_DEV_BSG
protocols (e.g. Task Management Functions and SMP in Serial
Attached SCSI).
 
+endif # BLOCK
+
 source block/Kconfig.iosched
-
To unsubscribe from this list: send the line unsubscribe git-commits-head in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html


bsg: Fix build for CONFIG_BLOCK=n

2007-07-28 Thread Linux Kernel Mailing List
Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4d5d8e9d3e55100bc12cf17a5ebc8a3c70befd38
Commit: 4d5d8e9d3e55100bc12cf17a5ebc8a3c70befd38
Parent: 4e97182a22ed5ca6a5cbc39275d4752d5a4369da
Author: Paul Mundt [EMAIL PROTECTED]
AuthorDate: Wed Jul 25 10:02:30 2007 +0200
Committer:  Jens Axboe [EMAIL PROTECTED]
CommitDate: Fri Jul 27 08:08:24 2007 +0200

bsg: Fix build for CONFIG_BLOCK=n

BLK_DEV_BSG was added outside of the if BLOCK check, which allows it to
be enabled when CONFIG_BLOCK=n. This leads to many screenlengths of
errors, starting with a parse error on the request_queue_t definition.
Obviously this wasn't intended for CONFIG_BLOCK=n usage, so just move the
option back in to the block.

Caught with a randconfig on sh.

Signed-off-by: Paul Mundt [EMAIL PROTECTED]

--

 block/Kconfig |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signed-off-by: Jens Axboe [EMAIL PROTECTED]
---
 block/Kconfig |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/Kconfig b/block/Kconfig
index ca2ef4e..2484e0e 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -49,8 +49,6 @@ config LSF
 
  If unsure, say Y.
 
-endif # BLOCK
-
 config BLK_DEV_BSG
bool Block layer SG support v4 (EXPERIMENTAL)
depends on EXPERIMENTAL
@@ -64,4 +62,6 @@ config BLK_DEV_BSG
protocols (e.g. Task Management Functions and SMP in Serial
Attached SCSI).
 
+endif # BLOCK
+
 source block/Kconfig.iosched
-
To unsubscribe from this list: send the line unsubscribe git-commits-head in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html