From 1dc44e5302626335d99438bd445cd310c3279a4c Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 24 Mar 2009 23:22:54 +0100 Subject: [PATCH] --- yaml --- r: 133398 b: refs/heads/master c: 662641d98b4396b48f513726d141c5f646c08259 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-frv/ide.h | 24 ------------------------ trunk/include/linux/ide.h | 4 ++-- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 trunk/include/asm-frv/ide.h diff --git a/[refs] b/[refs] index e069a5a7c2f7..420dda733e5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86ccf37c6acd74cf7e4b7751ee045de19943c5a0 +refs/heads/master: 662641d98b4396b48f513726d141c5f646c08259 diff --git a/trunk/include/asm-frv/ide.h b/trunk/include/asm-frv/ide.h deleted file mode 100644 index 361076611855..000000000000 --- a/trunk/include/asm-frv/ide.h +++ /dev/null @@ -1,24 +0,0 @@ -/* ide.h: FRV IDE declarations - * - * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. - * Written by David Howells (dhowells@redhat.com) - * - * 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 -#include -#include - -#include - -#endif /* __KERNEL__ */ -#endif /* _ASM_IDE_H */ diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index 24e265af4f1c..047b74621dd4 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/include/linux/ide.h @@ -193,8 +193,8 @@ static inline void ide_std_init_ports(hw_regs_t *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 #else