Patch for 2.1.16 drivers/char/esp.c

Alex Kiernan (alex@hisoft.co.uk)
18 Dec 1996 12:35:55 GMT

2.1.16 fails to compile the Hayes ESP serial driver (symbol renaming),
this allows it to compile (dunno if it actually works, I can't reboot
the machine which has the card in right now).

--- linux/drivers/char/esp.c~ Wed Dec 18 11:54:10 1996
+++ linux/drivers/char/esp.c Wed Dec 18 12:29:02 1996
@@ -68,8 +68,8 @@
static int irq[NR_PRIMARY] = {0,0,0,0,0,0,0,0}; /* IRQ for each base port */
static unsigned int divisor[NR_PRIMARY] = {0,0,0,0,0,0,0,0};
/* custom divisor for each port */
-static unsigned int dma = CONFIG_ESP_DMA_CHANNEL; /* DMA channel */
-static unsigned int trigger = CONFIG_ESP_TRIGGER_LEVEL; /* FIFO trigger level */
+static unsigned int dma = CONFIG_ESPSERIAL_DMA_CHANNEL; /* DMA channel */
+static unsigned int trigger = CONFIG_ESPSERIAL_TRIGGER_LEVEL; /* FIFO trigger level */
/* END */

static char *dma_buffer;
@@ -2409,7 +2409,7 @@
}

if ((dma != 1) && (dma != 3))
- dma = CONFIG_ESP_DMA_CHANNEL;
+ dma = CONFIG_ESPSERIAL_DMA_CHANNEL;

if ((trigger < 1) || (trigger > 1015))
trigger = 768;

-- 
Alex Kiernan - alex@hisoft.co.uk
HiSoft Systems, The Old School, Greenfield, Bedford, MK45 5DE, UK
http://www.hisoft.co.uk Tel: +44 1525 718181 Fax: +44 1525 713716