← Back to branch summary

~n-muench/ubuntu/maverick/open-vm-tools/open-vm-tools.fix-632101

« back to all changes in this revision

Viewing changes to modules/linux/vsock/linux/af_vsock.h

  • Committer: Nate Muench
  • Date: 2010-09-07 02:10:30 UTC
  • Revision ID: nowiwilldestroyabydos@gmail.com-20100907021030-msa3598ldopvwkye
http://bugs.debian.org/579721
http://bugs.debian.org/588356
https://launchpad.net/bugs/632101
* Merge from Debian testing (LP: #632101), remaining changes:
  - Recommend open-vm-toolbox in open-vm-tools.
  - Rediffing vsock.patch.
* Updating local Makefile to inject symvers files to fix vmhgfs and
  vsock modules, thanks to Joe Gooch <mrwizard@k12system.com> (Closes:
  #579721).
* Updating standards version to 3.9.1.
* Removing vmmemctl fom initscript (Closes: #588356).
* Merging upstream version 2010.06.16-268169.
* Updating standards version to 3.9.0.
* Updating README.source.
* Rediffing kvers.patch.
* Dropping procps.patch, not required anymore.
* Updating packaging for upstreams vmmemctl module removal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/linux/vsock/linux/af_vsock.h
30
30
#include "vsockPacket.h"
31
31
#include "compat_workqueue.h"
32
32
 
33
 
#if defined(VMX86_TOOLS)
34
 
#   include "vmciGuestKernelAPI.h"
35
 
#else
36
 
#   include "vmciHostKernelAPI.h"
37
 
#endif
 
33
#include "vmciKernelAPI.h"
38
34
 
39
35
#include "notify.h"
40
36