linux-next: build failure after merge of the tty tree

[Stephen Rothwell]

Hi Greg,

After merging the tty tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/staging/ipack/devices/ipoctal.c: In function 'ipoctal_set_termios':
drivers/staging/ipack/devices/ipoctal.c:614:22: error: invalid type argument of '->' (have 'struct ktermios')
drivers/staging/ipack/devices/ipoctal.c:640:15: error: invalid type argument of '->' (have 'struct ktermios')
drivers/staging/ipack/devices/ipoctal.c:654:14: error: invalid type argument of '->' (have 'struct ktermios')
drivers/staging/ipack/devices/ipoctal.c:691:2: error: incompatible type for argument 1 of 'tty_termios_encode_baud_rate'
include/linux/tty.h:449:13: note: expected 'struct ktermios *' but argument is of type 'struct ktermios'
drivers/staging/ipack/devices/ipoctal.c:694:22: error: invalid type argument of '->' (have 'struct ktermios')
drivers/staging/ipack/devices/ipoctal.c:735:3: error: incompatible type for argument 1 of 'tty_termios_encode_baud_rate'
include/linux/tty.h:449:13: note: expected 'struct ktermios *' but argument is of type 'struct ktermios'

Presumably caused by commit adc8d746caa6 ("tty: move the termios object
into the tty").

Under previous instructions about staging drivers, I have added the
following patch for today:

From c4bc70a8fc9cc687690aaf51865561ffcd6190f9 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 20 Jul 2012 13:25:12 +1000
Subject: [PATCH] disable SERIAL_IPOCTAL broken by tty updates

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/staging/ipack/devices/Kconfig |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/ipack/devices/Kconfig b/drivers/staging/ipack/devices/Kconfig
index 39f7188..8d69ce3 100644
--- a/drivers/staging/ipack/devices/Kconfig
+++ b/drivers/staging/ipack/devices/Kconfig
@@ -1,6 +1,7 @@
 config SERIAL_IPOCTAL
 	tristate "IndustryPack IP-OCTAL uart support"
 	depends on IPACK_BUS
+	depends on BROKEN
 	help
 	  This driver supports the IPOCTAL serial port device for the IndustryPack bus.
 	default n
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature