diff -Nuar linux-2.6.12.3.orig/drivers/serial/jsm/jsm_driver.c linux-2.6.12.3.new/drivers/serial/jsm/jsm_driver.c --- linux-2.6.12.3.orig/drivers/serial/jsm/jsm_driver.c 2005-07-19 15:16:20.000000000 -0500 +++ linux-2.6.12.3.new/drivers/serial/jsm/jsm_driver.c 2005-07-19 15:18:57.000000000 -0500 @@ -22,6 +22,10 @@ * Scott H Kilau * Wendy Xiong * + * CHANGE LOG: + * Jul 18, 2005: Changed the major number changed to 0 to use the dynamic + * allocation of major number by OS. + * ***********************************************************************/ #include #include @@ -42,7 +46,7 @@ .owner = THIS_MODULE, .driver_name = JSM_DRIVER_NAME, .dev_name = "ttyn", - .major = 253, + .major = 0, .minor = JSM_MINOR_START, .nr = NR_PORTS, }; diff -Nuar linux-2.6.12.3.orig/drivers/serial/jsm/jsm.h linux-2.6.12.3.new/drivers/serial/jsm/jsm.h --- linux-2.6.12.3.orig/drivers/serial/jsm/jsm.h 2005-07-19 15:16:21.000000000 -0500 +++ linux-2.6.12.3.new/drivers/serial/jsm/jsm.h 2005-07-19 15:18:58.000000000 -0500 @@ -22,6 +22,9 @@ * Scott H Kilau * Wendy Xiong * + * CHANGE LOG: + * Jul 18, 2005: Changed the JSM_VERSION to "jsm: 1.2-1-INKERNEL" + * ***********************************************************************/ #ifndef __JSM_DRIVER_H @@ -90,7 +93,7 @@ #define WRITEBUFLEN ((4096) + 4) #define MYFLIPLEN N_TTY_BUF_SIZE -#define JSM_VERSION "jsm: 1.1-1-INKERNEL" +#define JSM_VERSION "jsm: 1.2-1-INKERNEL" #define JSM_PARTNUM "40002438_A-INKERNEL" struct jsm_board; diff -Nuar linux-2.6.12.3.orig/drivers/serial/jsm/jsm_neo.c linux-2.6.12.3.new/drivers/serial/jsm/jsm_neo.c --- linux-2.6.12.3.orig/drivers/serial/jsm/jsm_neo.c 2005-07-19 15:16:22.000000000 -0500 +++ linux-2.6.12.3.new/drivers/serial/jsm/jsm_neo.c 2005-07-19 15:19:00.000000000 -0500 @@ -22,6 +22,9 @@ * Scott H Kilau * Wendy Xiong * + * CHANGE LOG: + * Jul 18, 2005: separated the mixed declarations and code. + * ***********************************************************************/ #include /* For udelay */ #include /* For the various UART offsets */ @@ -48,8 +51,9 @@ static void neo_set_cts_flow_control(struct jsm_channel *ch) { - u8 ier = readb(&ch->ch_neo_uart->ier); - u8 efr = readb(&ch->ch_neo_uart->efr); + u8 ier, efr; + ier = readb(&ch->ch_neo_uart->ier); + efr = readb(&ch->ch_neo_uart->efr); jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting CTSFLOW\n"); @@ -78,8 +82,9 @@ static void neo_set_rts_flow_control(struct jsm_channel *ch) { - u8 ier = readb(&ch->ch_neo_uart->ier); - u8 efr = readb(&ch->ch_neo_uart->efr); + u8 ier, efr; + ier = readb(&ch->ch_neo_uart->ier); + efr = readb(&ch->ch_neo_uart->efr); jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting RTSFLOW\n"); @@ -117,8 +122,9 @@ static void neo_set_ixon_flow_control(struct jsm_channel *ch) { - u8 ier = readb(&ch->ch_neo_uart->ier); - u8 efr = readb(&ch->ch_neo_uart->efr); + u8 ier, efr; + ier = readb(&ch->ch_neo_uart->ier); + efr = readb(&ch->ch_neo_uart->efr); jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXON FLOW\n"); @@ -153,8 +159,9 @@ static void neo_set_ixoff_flow_control(struct jsm_channel *ch) { - u8 ier = readb(&ch->ch_neo_uart->ier); - u8 efr = readb(&ch->ch_neo_uart->efr); + u8 ier, efr; + ier = readb(&ch->ch_neo_uart->ier); + efr = readb(&ch->ch_neo_uart->efr); jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXOFF FLOW\n"); @@ -190,8 +197,9 @@ static void neo_set_no_input_flow_control(struct jsm_channel *ch) { - u8 ier = readb(&ch->ch_neo_uart->ier); - u8 efr = readb(&ch->ch_neo_uart->efr); + u8 ier, efr; + ier = readb(&ch->ch_neo_uart->ier); + efr = readb(&ch->ch_neo_uart->efr); jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Input FLOW\n"); @@ -228,8 +236,9 @@ static void neo_set_no_output_flow_control(struct jsm_channel *ch) { - u8 ier = readb(&ch->ch_neo_uart->ier); - u8 efr = readb(&ch->ch_neo_uart->efr); + u8 ier, efr; + ier = readb(&ch->ch_neo_uart->ier); + efr = readb(&ch->ch_neo_uart->efr); jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Output FLOW\n");