frv: remove <asm/ide.h>
PATCH 1/2 frv: remove <asm/ide.h>
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] frv: remove <asm/ide.h>
* Remove superfluous <asm/{setup,io,irq}.h> includes.
* Remove <asm/ide.h>.
Cc David Howells <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- include/asm-frv/ide.h | 24 ------------------------ include/linux/ide.h | 4 ++-- 2 files changed, 2 insertions(+), 26 deletions(-)
include/asm-frv/ide.h deleted +0 -24
@@ -1,24 +0,0 @@ -/* ide.h: FRV IDE declarations -* -* Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. -* Written by David Howells ([email protected]) -* -* 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. -*/ - -#ifndef _ASM_IDE_H -#define _ASM_IDE_H - -#ifdef __KERNEL__ - -#include <asm/setup.h> -#include <asm/io.h> -#include <asm/irq.h> - -#include <asm-generic/ide_iops.h> - -#endif /* __KERNEL__ */ -#endif /* _ASM_IDE_H */
include/linux/ide.h +2 -2
@@ -193,8 +193,8 @@ static inline void ide_std_init_ports(hw hw->io_ports.ctl_addr = ctl_addr; } -#if defined(CONFIG_ARM ) || defined(CONFIG_FRV ) || defined(CONFIG_M68K ) || \ - defined(CONFIG_MIPS ) || defined(CONFIG_MN10300 ) || defined(CONFIG_PARISC ) \ +#if defined(CONFIG_ARM ) || 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> #else