Messages in this thread | | | Date | Mon, 28 Jan 2013 06:45:54 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the tty tree |
| |
On Mon, Jan 28, 2013 at 09:13:07PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/gadget/Kconfig between commit 4f73bc4dd3e8 ("tty: Added a > CONFIG_TTY option to allow removal of TTY") from the tty tree and commit > 3249ca22c088 ("usb: gadget: u_serial: convert into a module") from the > usb 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/usb/gadget/Kconfig > index a1bd951,6665d25..0000000 > --- a/drivers/usb/gadget/Kconfig > +++ b/drivers/usb/gadget/Kconfig > @@@ -750,7 -760,8 +760,9 @@@ config USB_GADGET_TARGE > > config USB_G_SERIAL > tristate "Serial Gadget (with CDC ACM and CDC OBEX support)" > + depends on TTY > + select USB_U_SERIAL > + select USB_F_ACM
Looks good, thanks.
greg k-h
| |