diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
| commit | ae38fd1e4c98588314a42097c5a5e77dcef23561 (patch) | |
| tree | f9f10c203bb9e5fbad4810d1f8774c08dfad20ff /drivers/char/ppdev.c | |
| parent | 466a823d79f41d0713b272e48fd73e494b0588e0 (diff) | |
Merge with Linux 2.3.50.
Diffstat (limited to 'drivers/char/ppdev.c')
| -rw-r--r-- | drivers/char/ppdev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index d73c09695..59853da1f 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c @@ -83,7 +83,7 @@ struct pp_struct { /* ROUND_UP macro from fs/select.c */ #define ROUND_UP(x,y) (((x)+(y)-1)/(y)) -static inline void enable_irq (struct pp_struct *pp) +static inline void pp_enable_irq (struct pp_struct *pp) { struct parport *port = pp->pdev->port; port->ops->enable_irq (port); @@ -144,7 +144,7 @@ static ssize_t pp_read (struct file * file, char * buf, size_t count, } kfree (kbuffer); - enable_irq (pp); + pp_enable_irq (pp); return bytes_read; } @@ -197,7 +197,7 @@ static ssize_t pp_write (struct file * file, const char * buf, size_t count, } kfree (kbuffer); - enable_irq (pp); + pp_enable_irq (pp); return bytes_written; } @@ -292,7 +292,7 @@ static int pp_ioctl(struct inode *inode, struct file *file, /* For interrupt-reporting to work, we need to be * informed of each interrupt. */ - enable_irq (pp); + pp_enable_irq (pp); /* We may need to fix up the state machine. */ info = &pp->pdev->port->ieee1284; @@ -441,7 +441,7 @@ static int pp_ioctl(struct inode *inode, struct file *file, ret = -ENXIO; break; } - enable_irq (pp); + pp_enable_irq (pp); return ret; case PPWCTLONIRQ: |