Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (39 commits)
  [SCSI] qla2xxx: Update version number to 8.02.00-k5.
  [SCSI] qla2xxx: Correct display of ISP serial-number.
  [SCSI] qla2xxx: Correct residual-count handling discrepancies during UNDERRUN handling.
  [SCSI] qla2xxx: Make driver (mostly) legacy I/O port free.
  [SCSI] qla2xxx: Fix issue where final flash-segment updates were falling into the slow-path write handler.
  [SCSI] qla2xxx: Handle unaligned sector writes during NVRAM/VPD updates.
  [SCSI] qla2xxx: Defer explicit interrupt-polling processing to init-time scenarios.
  [SCSI] qla2xxx: Resync with latest HBA SSID specification -- 2.2u.
  [SCSI] sym53c8xx: Remove sym_xpt_async_sent_bdr
  [SCSI] sym53c8xx: Remove pci_dev pointer from sym_shcb
  [SCSI] sym53c8xx: Make interrupt handler capable of returning IRQ_NONE
  [SCSI] sym53c8xx: Get rid of IRQ_FMT and IRQ_PRM
  [SCSI] sym53c8xx: Use scmd_printk where appropriate
  [SCSI] sym53c8xx: Simplify DAC DMA handling
  [SCSI] sym53c8xx: Remove tag_ctrl module parameter
  [SCSI] sym53c8xx: Remove io_ws, mmio_ws and ram_ws elements
  [SCSI] sym53c8xx: Remove ->device_id
  [SCSI] sym53c8xx: Use pdev->revision
  [SCSI] sym53c8xx: PCI Error Recovery support
  [SCSI] sym53c8xx: Stop overriding scsi_done
  ...

1 files changed, 0 insertions, 81 deletions

diff --git a/drivers/fc4/Kconfig b/drivers/fc4/Kconfig
deleted file mode 100644
index 345dbe6f10df..000000000000
--- a/drivers/fc4/Kconfig
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# FC4 device configuration
-#
-
-menu "Fibre Channel support"
-
-config FC4
-	tristate "Fibre Channel and FC4 SCSI support"
-	---help---
-	  Fibre Channel is a high speed serial protocol mainly used to
-	  connect large storage devices to the computer; it is compatible with
-	  and intended to replace SCSI.
-
-	  This is an experimental support for storage arrays connected to your
-	  computer using optical fibre cables and the "X3.269-199X Fibre
-	  Channel Protocol for SCSI" specification. If you want to use this,
-	  you need to say Y here and to "SCSI support" as well as to the
-	  drivers for the storage array itself and for the interface adapter
-	  such as SOC or SOC+. This subsystem could even serve for IP
-	  networking, with some code extensions.
-
-	  If unsure, say N.
-
-comment "FC4 drivers"
-	depends on FC4
-
-config FC4_SOC
-	tristate "Sun SOC/Sbus"
-	depends on FC4!=n && SPARC
-	help
-	  Serial Optical Channel is an interface card with one or two Fibre
-	  Optic ports, each of which can be connected to a disk array. Note
-	  that if you have older firmware in the card, you'll need the
-	  microcode from the Solaris driver to make it work.
-
-	  To compile this support as a module, choose M here: the module will
-	  be called soc.
-
-config FC4_SOCAL
-	tristate "Sun SOC+ (aka SOCAL)"
-	depends on FC4!=n && SPARC
-	---help---
-	  Serial Optical Channel Plus is an interface card with up to two
-	  Fibre Optic ports. This card supports FC Arbitrated Loop (usually
-	  A5000 or internal FC disks in E[3-6]000 machines through the
-	  Interface Board). You'll probably need the microcode from the
-	  Solaris driver to make it work.
-
-	  To compile this support as a module, choose M here: the module will
-	  be called socal.
-
-comment "FC4 targets"
-	depends on FC4
-
-config SCSI_PLUTO
-	tristate "SparcSTORAGE Array 100 and 200 series"
-	depends on FC4!=n && SCSI
-	help
-	  If you never bought a disk array made by Sun, go with N.
-
-	  To compile this support as a module, choose M here: the module will
-	  be called pluto.
-
-config SCSI_FCAL
-	tristate "Sun Enterprise Network Array (A5000 and EX500)" if SPARC
-	depends on FC4!=n && SCSI
-	help
-	  This driver drives FC-AL disks connected through a Fibre Channel
-	  card using the drivers/fc4 layer (currently only SOCAL). The most
-	  common is either A5000 array or internal disks in E[3-6]000
-	  machines.
-
-	  To compile this support as a module, choose M here: the module will
-	  be called fcal.
-
-config SCSI_FCAL
-	prompt "Generic FC-AL disk driver"
-	depends on FC4!=n && SCSI && !SPARC
-
-endmenu
-