Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 2a8f7450f828eaee49d66f41f99ac2e54f1160a6

Authored by Bartlomiej Zolnierkiewicz
1 parent f01d35d87f
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 9 changed files with 6 additions and 171 deletions Side-by-side Diff

include/asm-alpha/ide.h
View file @ 2a8f745
1   -/*
2   - * linux/include/asm-alpha/ide.h
3   - *
4   - * Copyright (C) 1994-1996 Linus Torvalds & authors
5   - */
6   -
7   -/*
8   - * This file contains the alpha architecture specific IDE code.
9   - */
10   -
11   -#ifndef __ASMalpha_IDE_H
12   -#define __ASMalpha_IDE_H
13   -
14   -#ifdef __KERNEL__
15   -
16   -#include <asm-generic/ide_iops.h>
17   -
18   -#endif /* __KERNEL__ */
19   -
20   -#endif /* __ASMalpha_IDE_H */
include/asm-blackfin/ide.h
View file @ 2a8f745
1   -/****************************************************************************/
2   -
3   -/*
4   - * linux/include/asm-blackfin/ide.h
5   - *
6   - * Copyright (C) 1994-1996 Linus Torvalds & authors
7   - * Copyright (C) 2001 Lineo Inc., davidm@snapgear.com
8   - * Copyright (C) 2002 Greg Ungerer (gerg@snapgear.com)
9   - * Copyright (C) 2002 Yoshinori Sato (ysato@users.sourceforge.jp)
10   - * Copyright (C) 2005 Hennerich Michael (hennerich@blackfin.uclinux.org)
11   - */
12   -
13   -/****************************************************************************/
14   -#ifndef _BLACKFIN_IDE_H
15   -#define _BLACKFIN_IDE_H
16   -/****************************************************************************/
17   -#ifdef __KERNEL__
18   -/****************************************************************************/
19   -
20   -#include <asm-generic/ide_iops.h>
21   -
22   -/****************************************************************************/
23   -#endif /* __KERNEL__ */
24   -#endif /* _BLACKFIN_IDE_H */
25   -/****************************************************************************/
include/asm-h8300/ide.h
View file @ 2a8f745
1   -/****************************************************************************/
2   -
3   -/*
4   - * linux/include/asm-h8300/ide.h
5   - *
6   - * Copyright (C) 1994-1996 Linus Torvalds & authors
7   - * Copyright (C) 2001 Lineo Inc., davidm@snapgear.com
8   - * Copyright (C) 2002 Greg Ungerer (gerg@snapgear.com)
9   - * Copyright (C) 2002 Yoshinori Sato (ysato@users.sourceforge.jp)
10   - */
11   -
12   -/****************************************************************************/
13   -#ifndef _H8300_IDE_H
14   -#define _H8300_IDE_H
15   -/****************************************************************************/
16   -#ifdef __KERNEL__
17   -/****************************************************************************/
18   -
19   -#include <asm-generic/ide_iops.h>
20   -
21   -/****************************************************************************/
22   -#endif /* __KERNEL__ */
23   -#endif /* _H8300_IDE_H */
24   -/****************************************************************************/
include/asm-ia64/ide.h
View file @ 2a8f745
1   -/*
2   - * linux/include/asm-ia64/ide.h
3   - *
4   - * Copyright (C) 1994-1996 Linus Torvalds & authors
5   - */
6   -
7   -/*
8   - * This file contains the ia64 architecture specific IDE code.
9   - */
10   -
11   -#ifndef __ASM_IA64_IDE_H
12   -#define __ASM_IA64_IDE_H
13   -
14   -#ifdef __KERNEL__
15   -
16   -#include <linux/irq.h>
17   -
18   -#include <asm-generic/ide_iops.h>
19   -
20   -#endif /* __KERNEL__ */
21   -
22   -#endif /* __ASM_IA64_IDE_H */
include/asm-m32r/ide.h
View file @ 2a8f745
1   -#ifndef _ASM_M32R_IDE_H
2   -#define _ASM_M32R_IDE_H
3   -
4   -/*
5   - * linux/include/asm-m32r/ide.h
6   - *
7   - * Copyright (C) 1994-1996 Linus Torvalds & authors
8   - */
9   -
10   -/*
11   - * This file contains the i386 architecture specific IDE code.
12   - */
13   -
14   -#ifdef __KERNEL__
15   -
16   -#include <asm-generic/ide_iops.h>
17   -
18   -#endif /* __KERNEL__ */
19   -
20   -#endif /* _ASM_M32R_IDE_H */
include/asm-sh/ide.h
View file @ 2a8f745
1   -/*
2   - * linux/include/asm-sh/ide.h
3   - *
4   - * Copyright (C) 1994-1996 Linus Torvalds & authors
5   - */
6   -
7   -/*
8   - * This file contains the i386 architecture specific IDE code.
9   - * In future, SuperH code.
10   - */
11   -
12   -#ifndef __ASM_SH_IDE_H
13   -#define __ASM_SH_IDE_H
14   -
15   -#ifdef __KERNEL__
16   -
17   -#include <asm-generic/ide_iops.h>
18   -
19   -#endif /* __KERNEL__ */
20   -
21   -#endif /* __ASM_SH_IDE_H */
include/asm-x86/ide.h
View file @ 2a8f745
1   -/*
2   - * Copyright (C) 1994-1996 Linus Torvalds & authors
3   - */
4   -
5   -/*
6   - * This file contains the i386 architecture specific IDE code.
7   - */
8   -
9   -#ifndef __ASMi386_IDE_H
10   -#define __ASMi386_IDE_H
11   -
12   -#ifdef __KERNEL__
13   -
14   -#include <asm-generic/ide_iops.h>
15   -
16   -#endif /* __KERNEL__ */
17   -
18   -#endif /* __ASMi386_IDE_H */
include/asm-xtensa/ide.h
View file @ 2a8f745
1   -/*
2   - * include/asm-xtensa/ide.h
3   - *
4   - * This file is subject to the terms and conditions of the GNU General Public
5   - * License. See the file "COPYING" in the main directory of this archive
6   - * for more details.
7   - *
8   - * Copyright (C) 1994 - 1996 Linus Torvalds & authors
9   - * Copyright (C) 2001 - 2005 Tensilica Inc.
10   - */
11   -
12   -#ifndef _XTENSA_IDE_H
13   -#define _XTENSA_IDE_H
14   -
15   -#ifdef __KERNEL__
16   -
17   -#include <asm-generic/ide_iops.h>
18   -
19   -#endif /* __KERNEL__ */
20   -
21   -#endif /* _XTENSA_IDE_H */
... ... @@ -211,7 +211,13 @@
211 211 return 0;
212 212 }
213 213  
  214 +#if defined(CONFIG_ARM) || defined(CONFIG_FRV) || defined(CONFIG_M68K) || \
  215 + defined(CONFIG_MIPS) || defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \
  216 + || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || defined(CONFIG_SPARC64)
214 217 #include <asm/ide.h>
  218 +#else
  219 +#include <asm-generic/ide_iops.h>
  220 +#endif
215 221  
216 222 #ifndef MAX_HWIFS
217 223 #if defined(CONFIG_BLACKFIN) || defined(CONFIG_H8300) || defined(CONFIG_XTENSA)