diff options
| author | David Miller <davem@davemloft.net> | 2007-01-10 23:15:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 18:18:21 -0800 |
| commit | 88bf7b391dca840f03fe25e4ff8fe6b4319fa07b (patch) | |
| tree | ee7ffbc4c2fec81c903f61eac85039eea630c1bd /drivers | |
| parent | e3db7691e9f3dff3289f64e3d98583e28afe03db (diff) | |
| download | linux-3.10-88bf7b391dca840f03fe25e4ff8fe6b4319fa07b.tar.gz linux-3.10-88bf7b391dca840f03fe25e4ff8fe6b4319fa07b.tar.bz2 linux-3.10-88bf7b391dca840f03fe25e4ff8fe6b4319fa07b.zip | |
[PATCH] really fix funsoft driver
Fix void cast and re-enable on sparc.
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/serial/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/funsoft.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index c8999ae5865..2f4d303ee36 100644 --- a/drivers/usb/serial/Kconfig +++ b/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/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c index d3be9214c7c..31501c9361b 100644 --- a/drivers/usb/serial/funsoft.c +++ b/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__, |