patches added and refresh

2 files changed, 139 insertions, 0 deletions

diff --git a/usb/usb-funsoft.patch b/usb/usb-funsoft.patch
new file mode 100644
index 0000000000000..d09f91494466d
--- /dev/null
+++ b/usb/usb-funsoft.patch
@@ -0,0 +1,109 @@
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: USB: add driver for funsoft usb serial device
+
+Cc: David Clare <david@funsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/Kconfig   |   10 ++++++
+ drivers/usb/serial/Makefile  |    1 
+ drivers/usb/serial/funsoft.c |   65 +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 76 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/serial/Kconfig
++++ gregkh-2.6/drivers/usb/serial/Kconfig
+@@ -158,6 +158,16 @@ config USB_SERIAL_FTDI_SIO
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called ftdi_sio.
+ 
++config USB_SERIAL_FUNSOFT
++	tristate "USB Funsoft Serial Driver"
++	depends on USB_SERIAL
++	---help---
++	  Say Y here if you want to use a Funsoft single port USB to serial
++	  converter device.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called funsoft.
++
+ config USB_SERIAL_VISOR
+ 	tristate "USB Handspring Visor / Palm m50x / Sony Clie Driver"
+ 	depends on USB_SERIAL
+--- gregkh-2.6.orig/drivers/usb/serial/Makefile
++++ gregkh-2.6/drivers/usb/serial/Makefile
+@@ -22,6 +22,7 @@ obj-$(CONFIG_USB_SERIAL_EDGEPORT)		+= io
+ obj-$(CONFIG_USB_SERIAL_EDGEPORT_TI)		+= io_ti.o
+ obj-$(CONFIG_USB_SERIAL_EMPEG)			+= empeg.o
+ obj-$(CONFIG_USB_SERIAL_FTDI_SIO)		+= ftdi_sio.o
++obj-$(CONFIG_USB_SERIAL_FUNSOFT)		+= funsoft.o
+ obj-$(CONFIG_USB_SERIAL_GARMIN)			+= garmin_gps.o
+ obj-$(CONFIG_USB_SERIAL_HP4X)			+= hp4x.o
+ obj-$(CONFIG_USB_SERIAL_IPAQ)			+= ipaq.o
+--- /dev/null
++++ gregkh-2.6/drivers/usb/serial/funsoft.c
+@@ -0,0 +1,65 @@
++/*
++ * Funsoft Serial USB driver
++ *
++ * Copyright (C) 2006 Greg Kroah-Hartman <gregkh@suse.de>
++ *
++ *	This program is free software; you can redistribute it and/or
++ *	modify it under the terms of the GNU General Public License version
++ *	2 as published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/tty.h>
++#include <linux/module.h>
++#include <linux/usb.h>
++#include "usb-serial.h"
++
++static struct usb_device_id id_table [] = {
++	{ USB_DEVICE(0x1404, 0xcddc) },
++	{ },
++};
++MODULE_DEVICE_TABLE(usb, id_table);
++
++static struct usb_driver funsoft_driver = {
++	.name =		"funsoft",
++	.probe =	usb_serial_probe,
++	.disconnect =	usb_serial_disconnect,
++	.id_table =	id_table,
++	.no_dynamic_id = 	1,
++};
++
++static struct usb_serial_driver funsoft_device = {
++	.driver = {
++		.owner =	THIS_MODULE,
++		.name =		"funsoft",
++	},
++	.id_table =		id_table,
++	.num_interrupt_in =	NUM_DONT_CARE,
++	.num_bulk_in =		NUM_DONT_CARE,
++	.num_bulk_out =		NUM_DONT_CARE,
++	.num_ports =		1,
++};
++
++static int __init funsoft_init(void)
++{
++	int retval;
++
++	retval = usb_serial_register(&funsoft_device);
++	if (retval)
++		return retval;
++	retval = usb_register(&funsoft_driver);
++	if (retval)
++		usb_serial_deregister(&funsoft_device);
++	return retval;
++}
++
++static void __exit funsoft_exit(void)
++{
++	usb_deregister(&funsoft_driver);
++	usb_serial_deregister(&funsoft_device);
++}
++
++module_init(funsoft_init);
++module_exit(funsoft_exit);
++MODULE_LICENSE("GPL");
diff --git a/usb/usb-remove-__init-from-usb_console_setup.patch b/usb/usb-remove-__init-from-usb_console_setup.patch
new file mode 100644
index 0000000000000..e4bdd6042283e
--- /dev/null
+++ b/usb/usb-remove-__init-from-usb_console_setup.patch
@@ -0,0 +1,30 @@
+From stable-bounces@linux.kernel.org Wed Apr 12 14:42:27 2006
+Date: Wed, 12 Apr 2006 23:41:59 +0200 (CEST)
+From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+To: Paul Fulghum <paulkf@microgate.com>
+Message-ID: <Pine.LNX.4.60.0604122330430.4984@poirot.grange>
+Cc: GregKH <gregkh@suse.de>
+Subject: USB: remove __init from usb_console_setup
+
+From: Paul Fulghum <paulkf@microgate.com>
+
+This prevents an Oops if booted with "console=ttyUSB0" but without a
+USB-serial dongle, and plugged one in afterwards.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/console.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gregkh-2.6.orig/drivers/usb/serial/console.c
++++ gregkh-2.6/drivers/usb/serial/console.c
+@@ -54,7 +54,7 @@ static struct console usbcons;
+  * serial.c code, except that the specifier is "ttyUSB" instead
+  * of "ttyS".
+  */
+-static int __init usb_console_setup(struct console *co, char *options)
++static int usb_console_setup(struct console *co, char *options)
+ {
+ 	struct usbcons_info *info = &usbcons_info;
+ 	int baud = 9600;