From 6d5ae5e5afed186475d556d199d63ee6b755ccc5 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Tue, 18 Jan 2011 15:02:20 +0000 Subject: [PATCH] --- yaml --- r: 236551 b: refs/heads/master c: 1d15f81cda496f1c1d59af7458ea0bcdeeb726f3 h: refs/heads/master i: 236549: dd664ff369b39b6d5786de702867482b46d4d9ff 236547: 98d09db0a7d702b156baad9a84123c9d279dfe8c 236543: a1a39cb76461a6521435b3bdf047684a93c29226 v: v3 --- [refs] | 2 +- trunk/drivers/net/vxge/vxge-config.c | 2 +- trunk/drivers/net/vxge/vxge-main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index df298c757ac0..5611cbbbda27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cca200362b46a6845b3f07367f5068a427161e1 +refs/heads/master: 1d15f81cda496f1c1d59af7458ea0bcdeeb726f3 diff --git a/trunk/drivers/net/vxge/vxge-config.c b/trunk/drivers/net/vxge/vxge-config.c index 01c05f53e2f9..da35562ba48c 100644 --- a/trunk/drivers/net/vxge/vxge-config.c +++ b/trunk/drivers/net/vxge/vxge-config.c @@ -387,8 +387,8 @@ vxge_hw_vpath_eprom_img_ver_get(struct __vxge_hw_device *hldev, data1 = steer_ctrl = 0; status = vxge_hw_vpath_fw_api(vpath, - VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO, VXGE_HW_FW_API_GET_EPROM_REV, + VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO, 0, &data0, &data1, &steer_ctrl); if (status != VXGE_HW_OK) break; diff --git a/trunk/drivers/net/vxge/vxge-main.c b/trunk/drivers/net/vxge/vxge-main.c index ecf9a8ee6838..0fcac099413a 100644 --- a/trunk/drivers/net/vxge/vxge-main.c +++ b/trunk/drivers/net/vxge/vxge-main.c @@ -4451,7 +4451,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre) if (!img[i].is_valid) break; vxge_debug_init(VXGE_TRACE, "%s: EPROM %d, version " - "%d.%d.%d.%d\n", VXGE_DRIVER_NAME, i, + "%d.%d.%d.%d", VXGE_DRIVER_NAME, i, VXGE_EPROM_IMG_MAJOR(img[i].version), VXGE_EPROM_IMG_MINOR(img[i].version), VXGE_EPROM_IMG_FIX(img[i].version),