[PATCH] USB: add HP49G+ Calculator USB Serial support

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index b869076..0c4aa00 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -395,6 +395,15 @@ config USB_SERIAL_PL2303
          To compile this driver as a module, choose M here: the
          module will be called pl2303.
 
+config USB_SERIAL_HP4X
+        tristate "USB HP4x Calculators support"
+        depends on USB_SERIAL
+        help
+          Say Y here if you want to use an Hewlett-Packard 4x Calculator.
+
+          To compile this driver as a module, choose M here: the
+          module will be called hp4x.
+
 config USB_SERIAL_SAFE
        tristate "USB Safe Serial (Encapsulated) Driver (EXPERIMENTAL)"
        depends on USB_SERIAL && EXPERIMENTAL

diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 351b818..b0aac47 100644 (file)
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -21,6 +21,7 @@ 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_GARMIN)                        += garmin_gps.o
+obj-$(CONFIG_USB_SERIAL_HP4X)                  += hp4x.o
 obj-$(CONFIG_USB_SERIAL_IPAQ)                  += ipaq.o
 obj-$(CONFIG_USB_SERIAL_IPW)                   += ipw.o
 obj-$(CONFIG_USB_SERIAL_IR)                    += ir-usb.o

diff --cc drivers/usb/serial/hp4x.c
Simple merge