diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/include/asm/parport.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/include/asm/parport.h')
| -rw-r--r-- | arch/mips/include/asm/parport.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/mips/include/asm/parport.h b/arch/mips/include/asm/parport.h index f52656826cce..cf252af64590 100644 --- a/arch/mips/include/asm/parport.h +++ b/arch/mips/include/asm/parport.h | |||
| @@ -1,15 +1 @@ | |||
| 1 | /* | #include <asm-generic/parport.h> | |
| 2 | * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk> | ||
| 3 | * | ||
| 4 | * This file should only be included by drivers/parport/parport_pc.c. | ||
| 5 | */ | ||
| 6 | #ifndef _ASM_PARPORT_H | ||
| 7 | #define _ASM_PARPORT_H | ||
| 8 | |||
| 9 | static int __devinit parport_pc_find_isa_ports(int autoirq, int autodma); | ||
| 10 | static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma) | ||
| 11 | { | ||
| 12 | return parport_pc_find_isa_ports(autoirq, autodma); | ||
| 13 | } | ||
| 14 | |||
| 15 | #endif /* _ASM_PARPORT_H */ | ||