On Wed, Oct 24, 2012 at 01:28:27PM +1100, Stephen Rothwell wrote: > Hi Greg, > > After merging the tty tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/staging/dgrp/dgrp_net_ops.c: In function 'dgrp_input': > drivers/staging/dgrp/dgrp_net_ops.c:216:27: error: 'struct tty_struct' has no member named 'real_raw' > drivers/staging/dgrp/dgrp_net_ops.c:229:8: error: 'struct tty_struct' has no member named 'read_cnt' > drivers/staging/dgrp/dgrp_net_ops.c:229:8: error: 'struct tty_struct' has no member named 'read_cnt' > drivers/staging/dgrp/dgrp_net_ops.c:261:30: error: 'struct tty_struct' has no member named 'real_raw' > drivers/staging/dgrp/dgrp_net_ops.c:276:28: error: 'struct tty_struct' has no member named 'real_raw' > > Caused by commits 53c5ee2cfb4d ("TTY: move ldisc data from tty_struct: > simple members") and ba2e68ac6157 ("TTY: move ldisc data from tty_struct: > read_* and echo_* and canon_* stuff") interacting with commit > 0b52b7497271 ("staging: Add dgrp driver for Digi Realport devices") now > in Linus' tree. > > I disabled building of the dgrp driver for now using this merge fix patch: > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Wed, 24 Oct 2012 13:25:29 +1100 > Subject: [PATCH] staging: disable dgrp driver since it is broken by tty > changes > > drivers/staging/dgrp/dgrp_net_ops.c: In function 'dgrp_input': > drivers/staging/dgrp/dgrp_net_ops.c:216:27: error: 'struct tty_struct' has no member named 'real_raw' > drivers/staging/dgrp/dgrp_net_ops.c:229:8: error: 'struct tty_struct' has no member named 'read_cnt' > drivers/staging/dgrp/dgrp_net_ops.c:229:8: error: 'struct tty_struct' has no member named 'read_cnt' > drivers/staging/dgrp/dgrp_net_ops.c:261:30: error: 'struct tty_struct' has no member named 'real_raw' > drivers/staging/dgrp/dgrp_net_ops.c:276:28: error: 'struct tty_struct' has no member named 'real_raw' > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > --- > drivers/staging/dgrp/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/staging/dgrp/Kconfig b/drivers/staging/dgrp/Kconfig > index 39f4bb6..7d378c2 100644 > --- a/drivers/staging/dgrp/Kconfig > +++ b/drivers/staging/dgrp/Kconfig > @@ -2,6 +2,7 @@ config DGRP > tristate "Digi Realport driver" > default n > depends on SYSFS > + depends on BROKEN Thanks, that makes sense for now, hopefully Jiri will return from his conference and fix this driver up. 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