From 2ee216f116af3bbba06e78ca05ab1e02192663d4 Mon Sep 17 00:00:00 2001 From: David Miller Date: Wed, 10 Jan 2007 23:15:40 -0800 Subject: [PATCH] --- yaml --- r: 45480 b: refs/heads/master c: 88bf7b391dca840f03fe25e4ff8fe6b4319fa07b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/Kconfig | 2 +- trunk/drivers/usb/serial/funsoft.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e31b1776ca26..4aa3f774d703 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3db7691e9f3dff3289f64e3d98583e28afe03db +refs/heads/master: 88bf7b391dca840f03fe25e4ff8fe6b4319fa07b diff --git a/trunk/drivers/usb/serial/Kconfig b/trunk/drivers/usb/serial/Kconfig index c8999ae58652..2f4d303ee36f 100644 --- a/trunk/drivers/usb/serial/Kconfig +++ b/trunk/drivers/usb/serial/Kconfig @@ -170,7 +170,7 @@ config USB_SERIAL_FTDI_SIO config USB_SERIAL_FUNSOFT tristate "USB Fundamental Software Dongle Driver" - depends on USB_SERIAL && !(SPARC || SPARC64) + depends on USB_SERIAL ---help--- Say Y here if you want to use the Fundamental Software dongle. diff --git a/trunk/drivers/usb/serial/funsoft.c b/trunk/drivers/usb/serial/funsoft.c index d3be9214c7c1..31501c9361b9 100644 --- a/trunk/drivers/usb/serial/funsoft.c +++ b/trunk/drivers/usb/serial/funsoft.c @@ -32,7 +32,7 @@ static int funsoft_ioctl(struct usb_serial_port *port, struct file *file, dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd); if (cmd == TCSETSF) { - if (user_termios_to_kernel_termios(&t, (void __user *)arg)) + if (user_termios_to_kernel_termios(&t, (struct termios __user *)arg)) return -EFAULT; dbg("%s - iflag:%x oflag:%x cflag:%x lflag:%x", __FUNCTION__,