linux-next: build failure after merge of the scsi tree

[Stephen Rothwell]

Hi James,

After merging the scsi tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/staging/keucr/scsiglue.c:349:2: error: unknown field 'proc_info' specified in initializer
drivers/staging/rts_pstor/rtsx.c:258:2: error: unknown field 'proc_info' specified in initializer
drivers/staging/rts5139/rts51x_scsi.c:2190:2: error: unknown field 'proc_info' specified in initializer

Caused by commit 104c4fe25dc9 ("[SCSI] remove scsi_host_template::proc_info").

Since this is a staging driver, I applied these following patches:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 26 Mar 2012 12:07:35 +1100
Subject: [PATCH] scsi: disable broken staging driver

This driver is broken by commit 104c4fe25dc9 ("[SCSI] remove
scsi_host_template::proc_info") from the scsi tree.

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/staging/keucr/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/keucr/Kconfig b/drivers/staging/keucr/Kconfig
index ba756bf..aef4858 100644
--- a/drivers/staging/keucr/Kconfig
+++ b/drivers/staging/keucr/Kconfig
@@ -1,6 +1,6 @@
 config USB_ENESTORAGE
 	tristate "USB ENE SM card reader support"
-	depends on USB && SCSI && m
+	depends on USB && SCSI && m && BROKEN
 	---help---
 	  Say Y here if you wish to control a ENE SM Card reader.
 	  To use SD/MS card, please build driver/usb/storage/ums-eneub6250.ko
-- 
1.7.9.1

From 4c836f9935ea1d2b2bc365aa1af70afbb2545311 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 26 Mar 2012 12:13:34 +1100
Subject: [PATCH] scsi: disable more staging drivers due to scsi breakage

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/staging/rts5139/Kconfig   |    2 +-
 drivers/staging/rts_pstor/Kconfig |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rts5139/Kconfig b/drivers/staging/rts5139/Kconfig
index afd526b..56bff83 100644
--- a/drivers/staging/rts5139/Kconfig
+++ b/drivers/staging/rts5139/Kconfig
@@ -1,6 +1,6 @@
 config RTS5139
 	tristate "Realtek RTS5139 USB card reader support"
-	depends on USB && SCSI
+	depends on USB && SCSI && BROKEN
 	help
 	  Say Y here to include driver code to support the Realtek
 	  RTS5139 USB card readers.
diff --git a/drivers/staging/rts_pstor/Kconfig b/drivers/staging/rts_pstor/Kconfig
index 4d66a99..1980a49 100644
--- a/drivers/staging/rts_pstor/Kconfig
+++ b/drivers/staging/rts_pstor/Kconfig
@@ -1,6 +1,6 @@
 config RTS_PSTOR
 	tristate "RealTek PCI-E Card Reader support"
-	depends on PCI && SCSI
+	depends on PCI && SCSI && BROKEN
 	help
 	  Say Y here to include driver code to support the Realtek
 	  PCI-E card readers.
-- 
1.7.9.1

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature