[PATCH 2/2] UBUNTU: [Config] build-in uinput module

[Jeremy Kerr]

The bluetooth userspace tools can use /dev/uinput to report events
from bluetooth input devices (eg volume up/down controls on a BT
headset).

However, the uinput module is not loaded automatically, as there is no
physical device to match on. Consequently, we don't have the uinput
device node present when the bluetooth daemon starts, and no synthesized
BT events are reported.

Instead of compiling uinput as a module, this change builds it into the
kernel, so it is always available.

BugLink: http://bugs.launchpad.net/bugs/584812

Signed-off-by: Jeremy Kerr <jeremy.kerr at canonical.com>

---
 debian.master/config/config.common.ports  |    2 +-
 debian.master/config/config.common.ubuntu |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index a983a52..95bb3c8 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -1515,7 +1515,7 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_TWL4030_VIBRA=m
 CONFIG_INPUT_WM831X_ON=m
 CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_IOSAPIC=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 9e40bac..7a84e2b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1966,7 +1966,7 @@ CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_TWL4030_VIBRA=m
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_WINBOND_CIR=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_WM831X_ON=m