diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-24 18:22:54 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-24 18:22:54 -0400 |
commit | 662641d98b4396b48f513726d141c5f646c08259 (patch) | |
tree | 3e1a3da5ec4386256e3f20728df00c695d1e01ff /include | |
parent | 86ccf37c6acd74cf7e4b7751ee045de19943c5a0 (diff) |
frv: remove <asm/ide.h>
* Remove superfluous <asm/{setup,io,irq}.h> includes.
* Remove <asm/ide.h>.
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-frv/ide.h | 24 | ||||
-rw-r--r-- | include/linux/ide.h | 4 |
2 files changed, 2 insertions, 26 deletions
diff --git a/include/asm-frv/ide.h b/include/asm-frv/ide.h deleted file mode 100644 index 361076611855..000000000000 --- a/include/asm-frv/ide.h +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | /* ide.h: FRV IDE declarations | ||
2 | * | ||
3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef _ASM_IDE_H | ||
13 | #define _ASM_IDE_H | ||
14 | |||
15 | #ifdef __KERNEL__ | ||
16 | |||
17 | #include <asm/setup.h> | ||
18 | #include <asm/io.h> | ||
19 | #include <asm/irq.h> | ||
20 | |||
21 | #include <asm-generic/ide_iops.h> | ||
22 | |||
23 | #endif /* __KERNEL__ */ | ||
24 | #endif /* _ASM_IDE_H */ | ||
diff --git a/include/linux/ide.h b/include/linux/ide.h index 24e265af4f1c..047b74621dd4 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -193,8 +193,8 @@ static inline void ide_std_init_ports(hw_regs_t *hw, | |||
193 | hw->io_ports.ctl_addr = ctl_addr; | 193 | hw->io_ports.ctl_addr = ctl_addr; |
194 | } | 194 | } |
195 | 195 | ||
196 | #if defined(CONFIG_ARM) || defined(CONFIG_FRV) || defined(CONFIG_M68K) || \ | 196 | #if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \ |
197 | defined(CONFIG_MIPS) || defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \ | 197 | defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \ |
198 | || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || defined(CONFIG_SPARC64) | 198 | || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || defined(CONFIG_SPARC64) |
199 | #include <asm/ide.h> | 199 | #include <asm/ide.h> |
200 | #else | 200 | #else |