diff options
author | David Miller <davem@davemloft.net> | 2007-01-11 02:15:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 21:18:21 -0500 |
commit | 88bf7b391dca840f03fe25e4ff8fe6b4319fa07b (patch) | |
tree | ee7ffbc4c2fec81c903f61eac85039eea630c1bd | |
parent | e3db7691e9f3dff3289f64e3d98583e28afe03db (diff) |
[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>
-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 c8999ae58652..2f4d303ee36f 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig | |||
@@ -170,7 +170,7 @@ config USB_SERIAL_FTDI_SIO | |||
170 | 170 | ||
171 | config USB_SERIAL_FUNSOFT | 171 | config USB_SERIAL_FUNSOFT |
172 | tristate "USB Fundamental Software Dongle Driver" | 172 | tristate "USB Fundamental Software Dongle Driver" |
173 | depends on USB_SERIAL && !(SPARC || SPARC64) | 173 | depends on USB_SERIAL |
174 | ---help--- | 174 | ---help--- |
175 | Say Y here if you want to use the Fundamental Software dongle. | 175 | Say Y here if you want to use the Fundamental Software dongle. |
176 | 176 | ||
diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c index d3be9214c7c1..31501c9361b9 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, | |||
32 | dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd); | 32 | dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd); |
33 | 33 | ||
34 | if (cmd == TCSETSF) { | 34 | if (cmd == TCSETSF) { |
35 | if (user_termios_to_kernel_termios(&t, (void __user *)arg)) | 35 | if (user_termios_to_kernel_termios(&t, (struct termios __user *)arg)) |
36 | return -EFAULT; | 36 | return -EFAULT; |
37 | 37 | ||
38 | dbg("%s - iflag:%x oflag:%x cflag:%x lflag:%x", __FUNCTION__, | 38 | dbg("%s - iflag:%x oflag:%x cflag:%x lflag:%x", __FUNCTION__, |