From patchwork Fri Oct 19 16:36:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Precise,SRU] Revert "UBUNTU: [Config] Disable vt6656" Date: Fri, 19 Oct 2012 06:36:03 -0000 From: Tim Gardner X-Patchwork-Id: 192773 Message-Id: <1350664563-107469-1-git-send-email-tim.gardner@canonical.com> To: kernel-team@lists.ubuntu.com This reverts commit 6c714b16e6c726cbc42a1e0156468d1dfda76da6. BugLink: http://bugs.launchpad.net/bugs/162671 Looks like we carried this from Oneiric by accident. Conflicts: drivers/staging/Makefile Signed-off-by: Tim Gardner --- drivers/staging/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 3ded8cd..d9e474d 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -30,7 +30,7 @@ obj-$(CONFIG_USB_SERIAL_QUATECH2) += serqt_usb2/ obj-$(CONFIG_USB_SERIAL_QUATECH_USB2) += quatech_usb2/ obj-$(CONFIG_OCTEON_ETHERNET) += octeon/ obj-$(CONFIG_VT6655) += vt6655/ -#obj-$(CONFIG_VT6656) += vt6656/ +obj-$(CONFIG_VT6656) += vt6656/ obj-$(CONFIG_VME_BUS) += vme/ obj-$(CONFIG_DX_SEP) += sep/ obj-$(CONFIG_IIO) += iio/