From a5a866d11296e831fe5a719d9c6db676ecbfb9bc Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 15 Feb 2016 15:22:31 +0000
Subject: [PATCH] udeb: Really add virtio_input to virtio-modules (not
 input-modules)

kernel-wedge is sensitive to the difference between '-' and '_' so
adding 'virtio-input ?' to input-modules had no effect.

If we really added virtio_input to input-modules then we would end up
with virtio and virtio_ring duplicated.  Instead, add it to
virtio-modules like all the other virtio drivers.
---
 debian/changelog                        | 1 +
 debian/installer/modules/input-modules  | 1 -
 debian/installer/modules/virtio-modules | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ba1468cb3..dd26cde3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ linux (4.4.1-1) UNRELEASED; urgency=medium
     - nic-pcmcia-modules: Remove Arcnet drivers
   * udeb: Move most USB wireless drivers from nic-usb-modules to
     nic-wireless-modules
+  * udeb: Really add virtio_input to virtio-modules (not input-modules)
 
   [ Roger Shimizu ]
   * Enable TTY_PRINTK as module (Closes: #814540).
diff --git a/debian/installer/modules/input-modules b/debian/installer/modules/input-modules
index f2ce5ed13..3245d16ea 100644
--- a/debian/installer/modules/input-modules
+++ b/debian/installer/modules/input-modules
@@ -35,6 +35,5 @@ wacom -
 # Miscellaneous input drivers
 synaptics_usb ?
 wistron_btns ?
-virtio-input ?
 gpio_keys ?
 soc_button_array ?
diff --git a/debian/installer/modules/virtio-modules b/debian/installer/modules/virtio-modules
index 01c6997e8..bb8947525 100644
--- a/debian/installer/modules/virtio-modules
+++ b/debian/installer/modules/virtio-modules
@@ -2,6 +2,7 @@ virtio_net
 virtio_blk
 virtio_balloon
 virtio_scsi
+virtio_input
 
 # Some architectures do not have PCI bus
 virtio_pci ?