diff mbox

[Precise,SRU] Revert "UBUNTU: [Config] Disable vt6656"

Message ID 1350664563-107469-1-git-send-email-tim.gardner@canonical.com
State New
Headers show

Commit Message

Tim Gardner Oct. 19, 2012, 4:36 p.m. UTC 
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 <tim.gardner@canonical.com>
---
 drivers/staging/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Brad Figg Oct. 19, 2012, 4:48 p.m. UTC | #1 
On 10/19/2012 09:36 AM, Tim Gardner wrote:
> 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 <tim.gardner@canonical.com>
> ---
>   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/
>
Herton Ronaldo Krzesinski Oct. 19, 2012, 5:01 p.m. UTC | #2
Tim Gardner Oct. 19, 2012, 5:17 p.m. UTC | #3 
I have not built for any of the ports arches or armel (only i386, amd64,
armhf). If it proves to be an issue we can always swizzle the config so
that this module is only built for i386, amd64, and armhf.

rtg
diff mbox

Patch

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/