hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ide: remove <asm/ide.h> for some archs 

* Remove <linux/irq.h> include from <asm-ia64.h> (<linux/ide.h> includes
  <linux/interrupt.h> which is enough).

* Remove <asm/ide.h> for alpha/blackfin/h8300/ia64/m32r/sh/x86/xtensa
  (this leaves us with arm/frv/m68k/mips/mn10300/parisc/powerpc/sparc[64]).

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-07-24 22:53:31 +02:00
parent f01d35d87f
commit 2a8f7450f8
9 changed files with 6 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/asm-alpha/ide.h
View File

@ -1,20 +0,0 @@
/*
* linux/include/asm-alpha/ide.h
*
* Copyright (C) 1994-1996 Linus Torvalds & authors
*/
/*
* This file contains the alpha architecture specific IDE code.
*/
#ifndef __ASMalpha_IDE_H
#define __ASMalpha_IDE_H
#ifdef __KERNEL__
#include <asm-generic/ide_iops.h>
#endif /* __KERNEL__ */
#endif /* __ASMalpha_IDE_H */

25
include/asm-blackfin/ide.h
View File

@ -1,25 +0,0 @@
/****************************************************************************/
/*
* linux/include/asm-blackfin/ide.h
*
* Copyright (C) 1994-1996 Linus Torvalds & authors
* Copyright (C) 2001 Lineo Inc., davidm@snapgear.com
* Copyright (C) 2002 Greg Ungerer (gerg@snapgear.com)
* Copyright (C) 2002 Yoshinori Sato (ysato@users.sourceforge.jp)
* Copyright (C) 2005 Hennerich Michael (hennerich@blackfin.uclinux.org)
*/
/****************************************************************************/
#ifndef _BLACKFIN_IDE_H
#define _BLACKFIN_IDE_H
/****************************************************************************/
#ifdef __KERNEL__
/****************************************************************************/
#include <asm-generic/ide_iops.h>
/****************************************************************************/
#endif /* __KERNEL__ */
#endif /* _BLACKFIN_IDE_H */
/****************************************************************************/

24
include/asm-h8300/ide.h
View File

@ -1,24 +0,0 @@
/****************************************************************************/
/*
* linux/include/asm-h8300/ide.h
*
* Copyright (C) 1994-1996 Linus Torvalds & authors
* Copyright (C) 2001 Lineo Inc., davidm@snapgear.com
* Copyright (C) 2002 Greg Ungerer (gerg@snapgear.com)
* Copyright (C) 2002 Yoshinori Sato (ysato@users.sourceforge.jp)
*/
/****************************************************************************/
#ifndef _H8300_IDE_H
#define _H8300_IDE_H
/****************************************************************************/
#ifdef __KERNEL__
/****************************************************************************/
#include <asm-generic/ide_iops.h>
/****************************************************************************/
#endif /* __KERNEL__ */
#endif /* _H8300_IDE_H */
/****************************************************************************/

22
include/asm-ia64/ide.h
View File

@ -1,22 +0,0 @@
/*
* linux/include/asm-ia64/ide.h
*
* Copyright (C) 1994-1996 Linus Torvalds & authors
*/
/*
* This file contains the ia64 architecture specific IDE code.
*/
#ifndef __ASM_IA64_IDE_H
#define __ASM_IA64_IDE_H
#ifdef __KERNEL__
#include <linux/irq.h>
#include <asm-generic/ide_iops.h>
#endif /* __KERNEL__ */
#endif /* __ASM_IA64_IDE_H */

20
include/asm-m32r/ide.h
View File

@ -1,20 +0,0 @@
#ifndef _ASM_M32R_IDE_H
#define _ASM_M32R_IDE_H
/*
* linux/include/asm-m32r/ide.h
*
* Copyright (C) 1994-1996 Linus Torvalds & authors
*/
/*
* This file contains the i386 architecture specific IDE code.
*/
#ifdef __KERNEL__
#include <asm-generic/ide_iops.h>
#endif /* __KERNEL__ */
#endif /* _ASM_M32R_IDE_H */

21
include/asm-sh/ide.h
View File

@ -1,21 +0,0 @@
/*
* linux/include/asm-sh/ide.h
*
* Copyright (C) 1994-1996 Linus Torvalds & authors
*/
/*
* This file contains the i386 architecture specific IDE code.
* In future, SuperH code.
*/
#ifndef __ASM_SH_IDE_H
#define __ASM_SH_IDE_H
#ifdef __KERNEL__
#include <asm-generic/ide_iops.h>
#endif /* __KERNEL__ */
#endif /* __ASM_SH_IDE_H */

18
include/asm-x86/ide.h
View File

@ -1,18 +0,0 @@
/*
* Copyright (C) 1994-1996 Linus Torvalds & authors
*/
/*
* This file contains the i386 architecture specific IDE code.
*/
#ifndef __ASMi386_IDE_H
#define __ASMi386_IDE_H
#ifdef __KERNEL__
#include <asm-generic/ide_iops.h>
#endif /* __KERNEL__ */
#endif /* __ASMi386_IDE_H */

21
include/asm-xtensa/ide.h
View File

@ -1,21 +0,0 @@
/*
* include/asm-xtensa/ide.h
*
* 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.
*
* Copyright (C) 1994 - 1996 Linus Torvalds & authors
* Copyright (C) 2001 - 2005 Tensilica Inc.
*/
#ifndef _XTENSA_IDE_H
#define _XTENSA_IDE_H
#ifdef __KERNEL__
#include <asm-generic/ide_iops.h>
#endif /* __KERNEL__ */
#endif /* _XTENSA_IDE_H */

6
include/linux/ide.h
View File

@ -211,7 +211,13 @@ static inline int __ide_default_irq(unsigned long base)
return 0; return 0;
} }
#if defined(CONFIG_ARM) || defined(CONFIG_FRV) || defined(CONFIG_M68K) || \
defined(CONFIG_MIPS) || defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \
|| defined(CONFIG_PPC) || defined(CONFIG_SPARC) || defined(CONFIG_SPARC64)
#include <asm/ide.h> #include <asm/ide.h>
#else
#include <asm-generic/ide_iops.h>
#endif
#ifndef MAX_HWIFS #ifndef MAX_HWIFS
#if defined(CONFIG_BLACKFIN) || defined(CONFIG_H8300) || defined(CONFIG_XTENSA) #if defined(CONFIG_BLACKFIN) || defined(CONFIG_H8300) || defined(CONFIG_XTENSA)