diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /drivers/scsi/ibmvscsi/ibmvfc.c | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) | |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'drivers/scsi/ibmvscsi/ibmvfc.c')
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvfc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index 5e8d51bd03de..cc82d0f322b6 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c | |||
| @@ -4905,7 +4905,7 @@ static unsigned long ibmvfc_get_desired_dma(struct vio_dev *vdev) | |||
| 4905 | return pool_dma + ((512 * 1024) * driver_template.cmd_per_lun); | 4905 | return pool_dma + ((512 * 1024) * driver_template.cmd_per_lun); |
| 4906 | } | 4906 | } |
| 4907 | 4907 | ||
| 4908 | static struct vio_device_id ibmvfc_device_table[] __devinitdata = { | 4908 | static struct vio_device_id ibmvfc_device_table[] = { |
| 4909 | {"fcp", "IBM,vfc-client"}, | 4909 | {"fcp", "IBM,vfc-client"}, |
| 4910 | { "", "" } | 4910 | { "", "" } |
| 4911 | }; | 4911 | }; |