From f3320dfab9fff388b8454853b243e43fd77774e7 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 22 May 2007 23:48:10 -0700 Subject: [PATCH] --- yaml --- r: 57070 b: refs/heads/master c: 89a4063e959a4701b998f3f1c3f8a6562ab5ba51 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/Kconfig | 14 -------------- trunk/drivers/scsi/Makefile | 3 +-- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 458fbadef7ca..6e858cda70cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ff263667798946abc15314eae3f341345877d7a +refs/heads/master: 89a4063e959a4701b998f3f1c3f8a6562ab5ba51 diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig index d28c14e23c32..572034ceb143 100644 --- a/trunk/drivers/scsi/Kconfig +++ b/trunk/drivers/scsi/Kconfig @@ -1753,23 +1753,9 @@ config SUN3X_ESP The ESP was an on-board SCSI controller used on Sun 3/80 machines. Say Y here to compile in support for it. -config SCSI_ESP_CORE - tristate "ESP Scsi Driver Core" - depends on SCSI - select SCSI_SPI_ATTRS - help - This is a core driver for NCR53c9x based scsi chipsets, - also known as "ESP" for Emulex Scsi Processor or - Enhanced Scsi Processor. This driver does not exist by - itself, there are front-end drivers which, when enabled, - select and enable this driver. One example is SCSI_SUNESP. - These front-end drivers provide probing, DMA, and register - access support for the core driver. - config SCSI_SUNESP tristate "Sparc ESP Scsi Driver" depends on SBUS && SCSI - select SCSI_ESP_CORE help This is the driver for the Sun ESP SCSI host adapter. The ESP chipset is present in most SPARC SBUS-based computers. diff --git a/trunk/drivers/scsi/Makefile b/trunk/drivers/scsi/Makefile index fc05d90229ac..b1b632791580 100644 --- a/trunk/drivers/scsi/Makefile +++ b/trunk/drivers/scsi/Makefile @@ -106,8 +106,7 @@ obj-$(CONFIG_MEGARAID_LEGACY) += megaraid.o obj-$(CONFIG_MEGARAID_NEWGEN) += megaraid/ obj-$(CONFIG_MEGARAID_SAS) += megaraid/ obj-$(CONFIG_SCSI_ACARD) += atp870u.o -obj-$(CONFIG_SCSI_ESP_CORE) += esp_scsi.o -obj-$(CONFIG_SCSI_SUNESP) += sun_esp.o +obj-$(CONFIG_SCSI_SUNESP) += esp_scsi.o sun_esp.o obj-$(CONFIG_SCSI_GDTH) += gdth.o obj-$(CONFIG_SCSI_INITIO) += initio.o obj-$(CONFIG_SCSI_INIA100) += a100u2w.o