Skip to content

Commit ea127f9

Browse files
Martin SchwidefskyLinus Torvalds
authored andcommitted
[PATCH] s390 (7/7): zfcp host adapter.
The zfcp scsi host adapater.
1 parent ba3b547 commit ea127f9

17 files changed

+14007
-3
lines changed

arch/s390/defconfig

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,35 @@ CONFIG_PFAULT=y
8585
#
8686
# SCSI device support
8787
#
88-
# CONFIG_SCSI is not set
88+
CONFIG_SCSI=y
89+
CONFIG_SCSI_PROC_FS=y
90+
91+
#
92+
# SCSI support type (disk, tape, CD-ROM)
93+
#
94+
CONFIG_BLK_DEV_SD=y
95+
CONFIG_CHR_DEV_ST=y
96+
# CONFIG_CHR_DEV_OSST is not set
97+
CONFIG_BLK_DEV_SR=y
98+
CONFIG_BLK_DEV_SR_VENDOR=y
99+
CONFIG_CHR_DEV_SG=y
100+
101+
#
102+
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
103+
#
104+
CONFIG_SCSI_MULTI_LUN=y
105+
# CONFIG_SCSI_REPORT_LUNS is not set
106+
CONFIG_SCSI_CONSTANTS=y
107+
CONFIG_SCSI_LOGGING=y
108+
109+
#
110+
# SCSI low-level drivers
111+
#
112+
# CONFIG_SCSI_AIC7XXX is not set
113+
# CONFIG_SCSI_AIC7XXX_OLD is not set
114+
# CONFIG_SCSI_EATA_PIO is not set
115+
# CONFIG_SCSI_DEBUG is not set
116+
CONFIG_ZFCP=y
89117
CONFIG_CCW=y
90118

91119
#
@@ -383,7 +411,11 @@ CONFIG_PARTITION_ADVANCED=y
383411
# CONFIG_ATARI_PARTITION is not set
384412
CONFIG_IBM_PARTITION=y
385413
# CONFIG_MAC_PARTITION is not set
386-
# CONFIG_MSDOS_PARTITION is not set
414+
CONFIG_MSDOS_PARTITION=y
415+
# CONFIG_BSD_DISKLABEL is not set
416+
# CONFIG_MINIX_SUBPARTITION is not set
417+
# CONFIG_SOLARIS_X86_PARTITION is not set
418+
# CONFIG_UNIXWARE_DISKLABEL is not set
387419
# CONFIG_LDM_PARTITION is not set
388420
# CONFIG_NEC98_PARTITION is not set
389421
# CONFIG_SGI_PARTITION is not set

drivers/s390/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
#
44

55
obj-y += s390mach.o sysinfo.o
6-
obj-y += cio/ block/ char/ net/
6+
obj-y += cio/ block/ char/ net/ scsi/
77

88
drivers-y += drivers/s390/built-in.o

drivers/s390/scsi/Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#
2+
# Makefile for the S/390 specific device drivers
3+
#
4+
5+
zfcp-objs := zfcp_aux.o zfcp_ccw.o zfcp_scsi.o zfcp_erp.o zfcp_qdio.o \
6+
zfcp_fsf.o zfcp_sysfs_adapter.o zfcp_sysfs_port.o \
7+
zfcp_sysfs_unit.o zfcp_sysfs_driver.o
8+
9+
obj-$(CONFIG_ZFCP) += zfcp.o

0 commit comments

Comments
 (0)