| Message ID | 1277135691-25755-1-git-send-email-apw@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Leann Ogasawara |
| Headers | show |
Applied to Maverick linux master. Thanks, Leann On Mon, 2010-06-21 at 16:54 +0100, Andy Whitcroft wrote: > BugLink: http://bugs.launchpad.net/bugs/592039 > Signed-off-by: Andy Whitcroft <apw@canonical.com> > --- > debian.master/config/config.common.ubuntu | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 59dd011..018cf18 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -4862,7 +4862,7 @@ CONFIG_VMIVME_7805=m > # CONFIG_VMSPLIT_1G is not set > # CONFIG_VMSPLIT_2G is not set > CONFIG_VMSPLIT_3G=y > -# CONFIG_VMWARE_BALLOON is not set > +CONFIG_VMWARE_BALLOON=m > CONFIG_VMWARE_PVSCSI=m > CONFIG_VMXNET3=m > CONFIG_VM_EVENT_COUNTERS=y > -- > 1.7.0.4 > >
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 59dd011..018cf18 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4862,7 +4862,7 @@ CONFIG_VMIVME_7805=m # CONFIG_VMSPLIT_1G is not set # CONFIG_VMSPLIT_2G is not set CONFIG_VMSPLIT_3G=y -# CONFIG_VMWARE_BALLOON is not set +CONFIG_VMWARE_BALLOON=m CONFIG_VMWARE_PVSCSI=m CONFIG_VMXNET3=m CONFIG_VM_EVENT_COUNTERS=y
BugLink: http://bugs.launchpad.net/bugs/592039 Signed-off-by: Andy Whitcroft <apw@canonical.com> --- debian.master/config/config.common.ubuntu | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)