Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42877
b: refs/heads/master
c: 4438982
h: refs/heads/master
i:
  42875: 3a86313
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Dec 7, 2006
1 parent 904faaf commit 5d72f18
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9711ef9945ce33b2b4ecb51a4db3f65f7d784876
refs/heads/master: 4438982f56b7e2ecb7932612601ba0390972ce3b
8 changes: 4 additions & 4 deletions trunk/drivers/parport/parport_pc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1975,7 +1975,7 @@ static int __devinit parport_ECPPS2_supported(struct parport *pb){return 0;}
/* --- IRQ detection -------------------------------------- */

/* Only if supports ECP mode */
static int __devinit programmable_irq_support(struct parport *pb)
static int programmable_irq_support(struct parport *pb)
{
int irq, intrLine;
unsigned char oecr = inb (ECONTROL (pb));
Expand All @@ -1992,7 +1992,7 @@ static int __devinit programmable_irq_support(struct parport *pb)
return irq;
}

static int __devinit irq_probe_ECP(struct parport *pb)
static int irq_probe_ECP(struct parport *pb)
{
int i;
unsigned long irqs;
Expand Down Expand Up @@ -2020,7 +2020,7 @@ static int __devinit irq_probe_ECP(struct parport *pb)
* This detection seems that only works in National Semiconductors
* This doesn't work in SMC, LGS, and Winbond
*/
static int __devinit irq_probe_EPP(struct parport *pb)
static int irq_probe_EPP(struct parport *pb)
{
#ifndef ADVANCED_DETECT
return PARPORT_IRQ_NONE;
Expand Down Expand Up @@ -2059,7 +2059,7 @@ static int __devinit irq_probe_EPP(struct parport *pb)
#endif /* Advanced detection */
}

static int __devinit irq_probe_SPP(struct parport *pb)
static int irq_probe_SPP(struct parport *pb)
{
/* Don't even try to do this. */
return PARPORT_IRQ_NONE;
Expand Down

0 comments on commit 5d72f18

Please sign in to comment.