On Wed, Dec 09, 2009 at 04:34:35PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in
> drivers/staging/vt6655/Kconfig and drivers/staging/vt6656/Kconfig between
> commit 125b181aec7a67c71234284ecf6d9c729d05deda ("staging: Add proper
> selection of WIRELESS_EXT and WEXT_PRIV") from Linus' tree and commit
> a0d2ec259009d9378343697af84636f1e16c2421 ("Staging: vt6x depends on
> WLAN") from the staging tree.
>
> I fixed it up (see below) and can carry the fix for a while.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc drivers/staging/vt6655/Kconfig
> index 825bbc4,ed51d7c..0000000
> --- a/drivers/staging/vt6655/Kconfig
> +++ b/drivers/staging/vt6655/Kconfig
> @@@ -1,8 -1,6 +1,8 @@@
> config VT6655
> tristate "VIA Technologies VT6655 support"
> - depends on PCI
> - depends on WIRELESS_EXT && PCI && WLAN
> ++ depends on PCI && WLAN
> + select WIRELESS_EXT
> + select WEXT_PRIV
> ---help---
> This is a vendor-written driver for VIA VT6655.
>
> diff --cc drivers/staging/vt6656/Kconfig
> index 87bcd26,fcde661..0000000
> --- a/drivers/staging/vt6656/Kconfig
> +++ b/drivers/staging/vt6656/Kconfig
> @@@ -1,8 -1,6 +1,8 @@@
> config VT6656
> tristate "VIA Technologies VT6656 support"
> - depends on USB
> - depends on WIRELESS_EXT && USB && WLAN
> ++ depends on USB && WLAN
> + select WIRELESS_EXT
> + select WEXT_PRIV
> ---help---
> This is a vendor-written driver for VIA VT6656.
Thanks, I'll fix this up when I sync up with Linus later today.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
