diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-16 18:44:50 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-16 18:44:50 (GMT) |
| commit | 491acf0032c08a74a4c88032ca1c03b498bfec37 (patch) | |
| tree | b7194d3afb144fa007d0ca6a11c96297f36d42f8 /drivers/staging/hv | |
| parent | 06fc8846a2c0ddcc51e6666a78fc29a8e749ca3b (diff) | |
| parent | e53beacd23d9cb47590da6a7a7f6d417b941a994 (diff) | |
| download | linux-fsl-qoriq-491acf0032c08a74a4c88032ca1c03b498bfec37.tar.xz | |
Staging: Merge 2.6.37-rc2 into staging-next
This was necessary in order to resolve some conflicts that happened
between -rc1 and -rc2 with the following files:
drivers/staging/bcm/Bcmchar.c
drivers/staging/intel_sst/intel_sst_app_interface.c
All should be resolved now.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv')
| -rw-r--r-- | drivers/staging/hv/hv_utils.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/hv/hv_utils.c b/drivers/staging/hv/hv_utils.c index 6dc1c35..53e1e29 100644 --- a/drivers/staging/hv/hv_utils.c +++ b/drivers/staging/hv/hv_utils.c @@ -212,9 +212,6 @@ static void heartbeat_onchannelcallback(void *context) recvlen, requestid); icmsghdrp = (struct icmsg_hdr *)&buf[ - sizeof(struct vmbuspipe_hdr)]; - - icmsghdrp = (struct icmsg_hdr *)&buf[ sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { |