The staging/dgnc and the serial/jsm drivers have the same origin. They come from the same codebase however the jsm is the community adopted version where the dgnc is kind of a direct submission from the Digi company. The recent commits to the jsm driver moved in the support for some of the Neo cards from the dgnc driver. This series of patches continues this trend by moving the support for the remaining Digi adapters (the Classic line) from dgnc to the jsm driver. This code is heavily based on the changes that were applied to the jsm/dgnc code when the support for the Neo adapters was moved to the mainline (git diff and LKML archives). Since after this change is applied the staging/dgnc driver is obsolete (no devices supported) it has been removed. I do not own the Classic card therefore I was unable to test it. I did my best being super-carefull during the implementation however it is highly recommended that someone tests it. Changelog: v2: move the declaration static structure describing baud_rates from the function to the top of the file. this removes the one compilation warning. this change is in the 2nd patch of the series. since Greg has already merged the patch 01 from the first series this time it is not attached therefore this series has only 4 patches in it (previously was 5). Konrad Zapalowicz (4): drivers: serial: jsm: Add the Classic board implementation drivers: serial: jsm: Enable support for Digi Classic adapters staging: dgnc: Remove driver in favor of serial/jsm driver drivers: serial: jsm: Remove FSF address from the file documentation/header MAINTAINERS | 7 - drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/dgnc/Kconfig | 6 - drivers/staging/dgnc/Makefile | 8 - drivers/staging/dgnc/TODO | 10 - drivers/staging/dgnc/dgnc_cls.c | 1389 --------------- drivers/staging/dgnc/dgnc_cls.h | 89 - drivers/staging/dgnc/dgnc_driver.c | 757 --------- drivers/staging/dgnc/dgnc_driver.h | 465 ----- drivers/staging/dgnc/dgnc_kcompat.h | 64 - drivers/staging/dgnc/dgnc_mgmt.c | 281 --- drivers/staging/dgnc/dgnc_mgmt.h | 31 - drivers/staging/dgnc/dgnc_neo.c | 1878 -------------------- drivers/staging/dgnc/dgnc_neo.h | 157 -- drivers/staging/dgnc/dgnc_pci.h | 75 - drivers/staging/dgnc/dgnc_sysfs.c | 750 -------- drivers/staging/dgnc/dgnc_sysfs.h | 49 - drivers/staging/dgnc/dgnc_tty.c | 3201 ----------------------------------- drivers/staging/dgnc/dgnc_tty.h | 42 - drivers/staging/dgnc/dgnc_types.h | 33 - drivers/staging/dgnc/dgnc_utils.c | 70 - drivers/staging/dgnc/dgnc_utils.h | 7 - drivers/staging/dgnc/digi.h | 415 ----- drivers/staging/dgnc/dpacompat.h | 115 -- drivers/tty/serial/Kconfig | 4 +- drivers/tty/serial/jsm/Makefile | 2 +- drivers/tty/serial/jsm/jsm.h | 12 +- drivers/tty/serial/jsm/jsm_cls.c | 985 +++++++++++ drivers/tty/serial/jsm/jsm_driver.c | 156 +- drivers/tty/serial/jsm/jsm_neo.c | 5 - drivers/tty/serial/jsm/jsm_tty.c | 7 +- 32 files changed, 1116 insertions(+), 9957 deletions(-) delete mode 100644 drivers/staging/dgnc/Kconfig delete mode 100644 drivers/staging/dgnc/Makefile delete mode 100644 drivers/staging/dgnc/TODO delete mode 100644 drivers/staging/dgnc/dgnc_cls.c delete mode 100644 drivers/staging/dgnc/dgnc_cls.h delete mode 100644 drivers/staging/dgnc/dgnc_driver.c delete mode 100644 drivers/staging/dgnc/dgnc_driver.h delete mode 100644 drivers/staging/dgnc/dgnc_kcompat.h delete mode 100644 drivers/staging/dgnc/dgnc_mgmt.c delete mode 100644 drivers/staging/dgnc/dgnc_mgmt.h delete mode 100644 drivers/staging/dgnc/dgnc_neo.c delete mode 100644 drivers/staging/dgnc/dgnc_neo.h delete mode 100644 drivers/staging/dgnc/dgnc_pci.h delete mode 100644 drivers/staging/dgnc/dgnc_sysfs.c delete mode 100644 drivers/staging/dgnc/dgnc_sysfs.h delete mode 100644 drivers/staging/dgnc/dgnc_tty.c delete mode 100644 drivers/staging/dgnc/dgnc_tty.h delete mode 100644 drivers/staging/dgnc/dgnc_types.h delete mode 100644 drivers/staging/dgnc/dgnc_utils.c delete mode 100644 drivers/staging/dgnc/dgnc_utils.h delete mode 100644 drivers/staging/dgnc/digi.h delete mode 100644 drivers/staging/dgnc/dpacompat.h create mode 100644 drivers/tty/serial/jsm/jsm_cls.c -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html