From: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>Subject: [PATCH] mn10300: remove <asm/ide.h>
* Remove superfluous <asm/intctl-regs.h> include.
* Remove no longer used SUPPORT_SLOW_DATA_PORTS define.
* Move defining SUPPORT_VLB_SYNC to <linux/ide.h>.
* Use __ide_mm_*() macros from <asm-generic/ide_iops.h> (MN10300 uses only memory-mapped I/O).
* Remove <asm/ide.h>.
While at it:
* Remove superfluous SPARC64 #ifdef from <linux/ide.h>.
Cc: David Howells <dhowells@xxxxxxxxxx>Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>--- include/asm-mn10300/ide.h | 39 --------------------------------------- include/linux/ide.h | 5 ++--- 2 files changed, 2 insertions(+), 42 deletions(-)
Index: b/include/asm-mn10300/ide.h===================================================================--- a/include/asm-mn10300/ide.h+++ /dev/null@@ -1,39 +0,0 @@-/* MN10300 Arch-specific IDE code- *- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.- * Written by David Howells (dhowells@xxxxxxxxxx)- * - Derived from include/asm-i386/ide.h- *- * This program is free software; you can redistribute it and/or- * modify it under the terms of the GNU General Public Licence- * as published by the Free Software Foundation; either version- * 2 of the Licence, or (at your option) any later version.- */--#ifndef _ASM_IDE_H-#define _ASM_IDE_H--#ifdef __KERNEL__--#include <asm/intctl-regs.h>--#undef SUPPORT_SLOW_DATA_PORTS-#define SUPPORT_SLOW_DATA_PORTS 0--#undef SUPPORT_VLB_SYNC-#define SUPPORT_VLB_SYNC 0--/*- * some bits needed for parts of the IDE subsystem to compile- */-#define __ide_mm_insw(port, addr, n) \- insw((unsigned long) (port), (addr), (n))-#define __ide_mm_insl(port, addr, n) \- insl((unsigned long) (port), (addr), (n))-#define __ide_mm_outsw(port, addr, n) \- outsw((unsigned long) (port), (addr), (n))-#define __ide_mm_outsl(port, addr, n) \- outsl((unsigned long) (port), (addr), (n))--#endif /* __KERNEL__ */-#endif /* _ASM_IDE_H */Index: b/include/linux/ide.h===================================================================--- a/include/linux/ide.h+++ b/include/linux/ide.h@@ -26,7 +26,7 @@ #include <asm/io.h> #include <asm/mutex.h> -#if defined(CONFIG_CRIS) || defined(CONFIG_FRV)+#if defined(CONFIG_CRIS) || defined(CONFIG_FRV) || defined(CONFIG_MN10300) # define SUPPORT_VLB_SYNC 0 #else # define SUPPORT_VLB_SYNC 1@@ -194,8 +194,7 @@ static inline void ide_std_init_ports(hw } #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)+ defined(CONFIG_PARISC) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) #include <asm/ide.h> #else #include <asm-generic/ide_iops.h> ÿôèº{.nÇ+?·?®??+%?Ëÿ±éݶ¥?wÿº{.nÇ+?·¥?{±þ'^þ)í?æèw* jg¬±¨ ¶????Ý¢jÿ¾«þG«?éÿ¢¸ ¢·¦j:+v?¨?wèjØm¶?ÿþø ¯ù ®w¥þ?àþf£¢·h??â?úÿ?Ù¥
