lkml.org 
[lkml]   [2013]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the tty tree with Linus' tree
Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/staging/sb105x/Kconfig between commit db210312f77b ("staging:
Make SystemBase PCI Multiport UART only for x86") from the tree and
commit e27a7d7977b0 ("Staging: sb105x: mark it BROKEN") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/staging/sb105x/Kconfig
index 1facad6,3d0d0eb..0000000
--- a/drivers/staging/sb105x/Kconfig
+++ b/drivers/staging/sb105x/Kconfig
@@@ -1,8 -1,7 +1,8 @@@
config SB105X
tristate "SystemBase PCI Multiport UART"
select SERIAL_CORE
- depends on PCI
+ depends on PCI && BROKEN
+ depends on X86
help
A driver for the SystemBase Multi-2/PCI serial card

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-01-17 03:41    [W:0.051 / U:0.364 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site