From 76fff7dbcd13e7437f49db01b4807b34e8ccbb2d Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 13 Apr 2004 04:28:56 -0700 Subject: [PATCH] add asm-generic/hdreg.h Use it on all archs which define ide_ioreg_t to unsigned long. --- include/asm-alpha/hdreg.h | 13 +------------ include/asm-arm/hdreg.h | 14 +------------- include/asm-arm26/hdreg.h | 16 +--------------- include/asm-generic/hdreg.h | 6 ++++++ include/asm-mips/hdreg.h | 17 +---------------- include/asm-parisc/hdreg.h | 7 +------ include/asm-ppc/hdreg.h | 18 +----------------- include/asm-ppc64/hdreg.h | 23 +---------------------- include/asm-sh/hdreg.h | 13 +------------ include/asm-sparc/hdreg.h | 14 +------------- include/asm-sparc64/hdreg.h | 14 +------------- 11 files changed, 16 insertions(+), 139 deletions(-) create mode 100644 include/asm-generic/hdreg.h diff --git a/include/asm-alpha/hdreg.h b/include/asm-alpha/hdreg.h index 81d8a40802c3..7f7fd1af0af3 100644 --- a/include/asm-alpha/hdreg.h +++ b/include/asm-alpha/hdreg.h @@ -1,12 +1 @@ -/* - * linux/include/asm-alpha/hdreg.h - * - * Copyright (C) 1994-1996 Linus Torvalds & authors - */ - -#ifndef __ASMalpha_HDREG_H -#define __ASMalpha_HDREG_H - -typedef unsigned long ide_ioreg_t; - -#endif /* __ASMalpha_HDREG_H */ +#include diff --git a/include/asm-arm/hdreg.h b/include/asm-arm/hdreg.h index 81bc05e16260..7f7fd1af0af3 100644 --- a/include/asm-arm/hdreg.h +++ b/include/asm-arm/hdreg.h @@ -1,13 +1 @@ -/* - * linux/include/asm-arm/hdreg.h - * - * Copyright (C) 1994-1996 Linus Torvalds & authors - */ - -#ifndef __ASMARM_HDREG_H -#define __ASMARM_HDREG_H - -typedef unsigned long ide_ioreg_t; - -#endif /* __ASMARM_HDREG_H */ - +#include diff --git a/include/asm-arm26/hdreg.h b/include/asm-arm26/hdreg.h index 32e338ce4883..7f7fd1af0af3 100644 --- a/include/asm-arm26/hdreg.h +++ b/include/asm-arm26/hdreg.h @@ -1,15 +1 @@ -/* - * linux/include/asm-arm26/hdreg.h - * - * Used by include/linux/ide.h - * - * Copyright (C) 1994-1996 Linus Torvalds & authors - */ - -#ifndef __ASMARM_HDREG_H -#define __ASMARM_HDREG_H - -typedef unsigned long ide_ioreg_t; - -#endif /* __ASMARM_HDREG_H */ - +#include diff --git a/include/asm-generic/hdreg.h b/include/asm-generic/hdreg.h new file mode 100644 index 000000000000..f6ecba25ccfb --- /dev/null +++ b/include/asm-generic/hdreg.h @@ -0,0 +1,6 @@ +#ifndef __ASM_GENERIC_HDREG_H +#define __ASM_GENERIC_HDREG_H + +typedef unsigned long ide_ioreg_t; + +#endif /* __ASM_GENERIC_HDREG_H */ diff --git a/include/asm-mips/hdreg.h b/include/asm-mips/hdreg.h index 0a952a910637..7f7fd1af0af3 100644 --- a/include/asm-mips/hdreg.h +++ b/include/asm-mips/hdreg.h @@ -1,16 +1 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * This file contains the MIPS architecture specific IDE code. - * - * Copyright (C) 1994-1996 Linus Torvalds & authors - * Copyright (C) 2001 Ralf Baechle - */ -#ifndef _ASM_HDREG_H -#define _ASM_HDREG_H - -typedef unsigned long ide_ioreg_t; - -#endif /* _ASM_HDREG_H */ +#include diff --git a/include/asm-parisc/hdreg.h b/include/asm-parisc/hdreg.h index f934c760bf0e..7f7fd1af0af3 100644 --- a/include/asm-parisc/hdreg.h +++ b/include/asm-parisc/hdreg.h @@ -1,6 +1 @@ -#ifndef _ASM_HDREG_H -#define _ASM_HDREG_H - -typedef unsigned long ide_ioreg_t; - -#endif +#include diff --git a/include/asm-ppc/hdreg.h b/include/asm-ppc/hdreg.h index f616b43235b7..7f7fd1af0af3 100644 --- a/include/asm-ppc/hdreg.h +++ b/include/asm-ppc/hdreg.h @@ -1,17 +1 @@ -/* - * include/asm-ppc/hdreg.h - * - * Copyright (C) 1994-1996 Linus Torvalds & authors - */ - -/* - * This file contains the ppc architecture specific IDE code. - */ - -#ifndef __ASMPPC_HDREG_H -#define __ASMPPC_HDREG_H - -typedef unsigned long ide_ioreg_t; - -#endif /* __ASMPPC_HDREG_H */ - +#include diff --git a/include/asm-ppc64/hdreg.h b/include/asm-ppc64/hdreg.h index 497596f2d157..7f7fd1af0af3 100644 --- a/include/asm-ppc64/hdreg.h +++ b/include/asm-ppc64/hdreg.h @@ -1,22 +1 @@ -/* - * linux/include/asm-ppc/hdreg.h - * - * Copyright (C) 1994-1996 Linus Torvalds & authors - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ - -/* - * This file contains the ppc architecture specific IDE code. - */ - -#ifndef __ASMPPC64_HDREG_H -#define __ASMPPC64_HDREG_H - -typedef unsigned long ide_ioreg_t; - -#endif /* __ASMPPC64_HDREG_H */ - +#include diff --git a/include/asm-sh/hdreg.h b/include/asm-sh/hdreg.h index 9112275e05f8..7f7fd1af0af3 100644 --- a/include/asm-sh/hdreg.h +++ b/include/asm-sh/hdreg.h @@ -1,12 +1 @@ -/* - * linux/include/asm-sh/hdreg.h - * - * Copyright (C) 1994-1996 Linus Torvalds & authors - */ - -#ifndef __ASM_SH_HDREG_H -#define __ASM_SH_HDREG_H - -typedef unsigned long ide_ioreg_t; - -#endif /* __ASM_SH_HDREG_H */ +#include diff --git a/include/asm-sparc/hdreg.h b/include/asm-sparc/hdreg.h index 8df7a4693fb6..7f7fd1af0af3 100644 --- a/include/asm-sparc/hdreg.h +++ b/include/asm-sparc/hdreg.h @@ -1,13 +1 @@ -/* $Id: hdreg.h,v 1.2 2000/12/05 00:56:36 anton Exp $ - * hdreg.h: SPARC PCI specific IDE glue. - * - * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) - * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) - */ - -#ifndef __SPARC_HDREG_H -#define __SPARC_HDREG_H - -typedef unsigned long ide_ioreg_t; - -#endif /* __SPARC_HDREG_H */ +#include diff --git a/include/asm-sparc64/hdreg.h b/include/asm-sparc64/hdreg.h index 29b7cfe6dd05..7f7fd1af0af3 100644 --- a/include/asm-sparc64/hdreg.h +++ b/include/asm-sparc64/hdreg.h @@ -1,13 +1 @@ -/* $Id: hdreg.h,v 1.1 1999/05/14 07:23:13 davem Exp $ - * hdreg.h: Ultra/PCI specific IDE glue. - * - * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) - * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) - */ - -#ifndef __SPARC64_HDREG_H -#define __SPARC64_HDREG_H - -typedef unsigned long ide_ioreg_t; - -#endif /* __SPARC64_HDREG_H */ +#include -- cgit v1.2.3