aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/parport.h
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-08-15 11:28:35 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-08-25 04:22:30 -0400
commit4a8052d8445a24771905d71d13f917146f9e822c (patch)
treed2fd167db6382fd0391fd5f582f9ecc56c43463c /arch/arm/include/asm/parport.h
parent7ac68a4c1de6aac5b0bb231fe6d8505ebe5686d9 (diff)
ARM: 7491/1: use generic version of identical asm headers
Inspired by the AArgh64 claim that it should be separate from ARM and one reason was being able to use more asm-generic headers. Doing a diff of arch/arm/include/asm and include/asm-generic there are numerous asm headers which are functionally identical to their asm-generic counterparts. Delete the ARM version and use the generic ones. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Reviewed-by: Nicolas Pitre <nico@linaro.org> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/parport.h')
-rw-r--r--arch/arm/include/asm/parport.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/include/asm/parport.h b/arch/arm/include/asm/parport.h
deleted file mode 100644
index 26e94b09035a..000000000000
--- a/arch/arm/include/asm/parport.h
+++ /dev/null
@@ -1,18 +0,0 @@
1/*
2 * arch/arm/include/asm/parport.h: ARM-specific parport initialisation
3 *
4 * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk>
5 *
6 * This file should only be included by drivers/parport/parport_pc.c.
7 */
8
9#ifndef __ASMARM_PARPORT_H
10#define __ASMARM_PARPORT_H
11
12static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma);
13static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
14{
15 return parport_pc_find_isa_ports (autoirq, autodma);
16}
17
18#endif /* !(_ASMARM_PARPORT_H) */