diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-08-15 16:28:35 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-08-25 09:22:30 +0100 |
| commit | 4a8052d8445a24771905d71d13f917146f9e822c (patch) | |
| tree | d2fd167db6382fd0391fd5f582f9ecc56c43463c /arch/arm/include/asm/parport.h | |
| parent | 7ac68a4c1de6aac5b0bb231fe6d8505ebe5686d9 (diff) | |
| download | op-kernel-dev-4a8052d8445a24771905d71d13f917146f9e822c.zip op-kernel-dev-4a8052d8445a24771905d71d13f917146f9e822c.tar.gz | |
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.h | 18 |
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 26e94b0..0000000 --- a/arch/arm/include/asm/parport.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * arch/arm/include/asm/parport.h: ARM-specific parport initialisation - * - * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk> - * - * This file should only be included by drivers/parport/parport_pc.c. - */ - -#ifndef __ASMARM_PARPORT_H -#define __ASMARM_PARPORT_H - -static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma); -static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) -{ - return parport_pc_find_isa_ports (autoirq, autodma); -} - -#endif /* !(_ASMARM_PARPORT_H) */ |
