diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
| commit | a2ab67fae1ab9226679495a8d260f4e6555efc5f (patch) | |
| tree | f7de683c9c8ff0869a7e11f1d40802145d05f5b4 /drivers/s390/scsi/zfcp_ccw.c | |
| parent | 6d0485a99366d4e0e7e725f14995c74cb7ca4499 (diff) | |
| parent | 135cad366b4e7d6a79f6369f6cb5b721985aa62f (diff) | |
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'drivers/s390/scsi/zfcp_ccw.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_ccw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c index cfb0dcb6e3ff..733fe3bf6285 100644 --- a/drivers/s390/scsi/zfcp_ccw.c +++ b/drivers/s390/scsi/zfcp_ccw.c | |||
| @@ -108,7 +108,6 @@ static int zfcp_ccw_set_online(struct ccw_device *ccw_device) | |||
| 108 | /* initialize request counter */ | 108 | /* initialize request counter */ |
| 109 | BUG_ON(!zfcp_reqlist_isempty(adapter)); | 109 | BUG_ON(!zfcp_reqlist_isempty(adapter)); |
| 110 | adapter->req_no = 0; | 110 | adapter->req_no = 0; |
| 111 | zfcp_fc_nameserver_init(adapter); | ||
| 112 | 111 | ||
| 113 | zfcp_erp_modify_adapter_status(adapter, "ccsonl1", NULL, | 112 | zfcp_erp_modify_adapter_status(adapter, "ccsonl1", NULL, |
| 114 | ZFCP_STATUS_COMMON_RUNNING, ZFCP_SET); | 113 | ZFCP_STATUS_COMMON_RUNNING, ZFCP_SET); |