From ace97ec8c9a6807fdbfa65c35cda786be0e7cba3 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Sat, 7 Jun 2014 07:41:54 +0000
Subject: [PATCH] [armhf/armmp] Enable VIRTIO_BALLOON and VIRTIO_PCI (Closes:
 #750742)

svn path=/dists/sid/linux/; revision=21407
---
 debian/changelog                 | 7 +++++++
 debian/config/armhf/config.armmp | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8d3f57f6b..b202cf764 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (3.14.5-2) UNRELEASED; urgency=medium
+
+  [ Ian Campbell ]
+  * [armhf/armmp] Enable VIRTIO_BALLOON and VIRTIO_PCI (Closes: #750742)
+
+ -- Ian Campbell <ijc@hellion.org.uk>  Fri, 06 Jun 2014 18:18:41 +0100
+
 linux (3.14.5-1) unstable; urgency=high
 
   * New upstream stable update:
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index f9d65d975..69190c4a2 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -749,7 +749,9 @@ CONFIG_FB_OMAP2=m
 ##
 ## file: drivers/virtio/Kconfig
 ##
+CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_BALLOON=m
 
 ##
 ## file: drivers/watchdog/Kconfig