diff for duplicates of <200901191934.02370.bzolnier@gmail.com> diff --git a/a/1.txt b/N1/1.txt index bf486ec..d414774 100644 Binary files a/a/1.txt and b/N1/1.txt differ diff --git a/a/content_digest b/N1/content_digest index 3919997..158ca1d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,98 +6,15 @@ " David Howells <dhowells@redhat.com>\0" "\00:1\0" "b\0" - "From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>\n" - "Subject: [PATCH] mn10300: remove <asm/ide.h>\n" - "\n" + "From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>Subject: [PATCH] mn10300: remove <asm/ide.h>\n" "* Remove superfluous <asm/intctl-regs.h> include.\n" - "\n" "* Remove no longer used SUPPORT_SLOW_DATA_PORTS define.\n" - "\n" "* Move defining SUPPORT_VLB_SYNC to <linux/ide.h>.\n" - "\n" - "* Use __ide_mm_*() macros from <asm-generic/ide_iops.h>\n" - " (MN10300 uses only memory-mapped I/O).\n" - "\n" + "* Use __ide_mm_*() macros from <asm-generic/ide_iops.h> (MN10300 uses only memory-mapped I/O).\n" "* Remove <asm/ide.h>.\n" - "\n" "While at it:\n" - "\n" "* Remove superfluous SPARC64 #ifdef from <linux/ide.h>.\n" - "\n" - "Cc: David Howells <dhowells@redhat.com>\n" - "Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>\n" - "---\n" - " include/asm-mn10300/ide.h | 39 ---------------------------------------\n" - " include/linux/ide.h | 5 ++---\n" - " 2 files changed, 2 insertions(+), 42 deletions(-)\n" - "\n" - "Index: b/include/asm-mn10300/ide.h\n" - "===================================================================\n" - "--- a/include/asm-mn10300/ide.h\n" - "+++ /dev/null\n" - "@@ -1,39 +0,0 @@\n" - "-/* MN10300 Arch-specific IDE code\n" - "- *\n" - "- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.\n" - "- * Written by David Howells (dhowells@redhat.com)\n" - "- * - Derived from include/asm-i386/ide.h\n" - "- *\n" - "- * This program is free software; you can redistribute it and/or\n" - "- * modify it under the terms of the GNU General Public Licence\n" - "- * as published by the Free Software Foundation; either version\n" - "- * 2 of the Licence, or (at your option) any later version.\n" - "- */\n" - "-\n" - "-#ifndef _ASM_IDE_H\n" - "-#define _ASM_IDE_H\n" - "-\n" - "-#ifdef __KERNEL__\n" - "-\n" - "-#include <asm/intctl-regs.h>\n" - "-\n" - "-#undef SUPPORT_SLOW_DATA_PORTS\n" - "-#define SUPPORT_SLOW_DATA_PORTS 0\n" - "-\n" - "-#undef SUPPORT_VLB_SYNC\n" - "-#define SUPPORT_VLB_SYNC 0\n" - "-\n" - "-/*\n" - "- * some bits needed for parts of the IDE subsystem to compile\n" - "- */\n" - "-#define __ide_mm_insw(port, addr, n) \\\n" - "-\tinsw((unsigned long) (port), (addr), (n))\n" - "-#define __ide_mm_insl(port, addr, n) \\\n" - "-\tinsl((unsigned long) (port), (addr), (n))\n" - "-#define __ide_mm_outsw(port, addr, n) \\\n" - "-\toutsw((unsigned long) (port), (addr), (n))\n" - "-#define __ide_mm_outsl(port, addr, n) \\\n" - "-\toutsl((unsigned long) (port), (addr), (n))\n" - "-\n" - "-#endif /* __KERNEL__ */\n" - "-#endif /* _ASM_IDE_H */\n" - "Index: b/include/linux/ide.h\n" - "===================================================================\n" - "--- a/include/linux/ide.h\n" - "+++ b/include/linux/ide.h\n" - "@@ -26,7 +26,7 @@\n" - " #include <asm/io.h>\n" - " #include <asm/mutex.h>\n" - " \n" - "-#if defined(CONFIG_CRIS) || defined(CONFIG_FRV)\n" - "+#if defined(CONFIG_CRIS) || defined(CONFIG_FRV) || defined(CONFIG_MN10300)\n" - " # define SUPPORT_VLB_SYNC 0\n" - " #else\n" - " # define SUPPORT_VLB_SYNC 1\n" - "@@ -194,8 +194,7 @@ static inline void ide_std_init_ports(hw\n" - " }\n" - " \n" - " #if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \\\n" - "- defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \\\n" - "- || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || defined(CONFIG_SPARC64)\n" - "+ defined(CONFIG_PARISC) || defined(CONFIG_PPC) || defined(CONFIG_SPARC)\n" - " #include <asm/ide.h>\n" - " #else\n" - " #include <asm-generic/ide_iops.h>\n" - "\0" + "Cc: David Howells <dhowells@redhat.com>Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>--- include/asm-mn10300/ide.h | 39 --------------------------------------- include/linux/ide.h | 5 ++--- 2 files changed, 2 insertions(+), 42 deletions(-)\n" + "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@redhat.com)- * - 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) \\-\tinsw((unsigned long) (port), (addr), (n))-#define __ide_mm_insl(port, addr, n) \\-\tinsl((unsigned long) (port), (addr), (n))-#define __ide_mm_outsw(port, addr, n) \\-\toutsw((unsigned long) (port), (addr), (n))-#define __ide_mm_outsl(port, addr, n) \\-\toutsl((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>\0\303\277\303\264\303\250\302\272{.n\303\207+\302\211\302\267\302\237\302\256\302\211\302\255\302\206+%\302\212\303\213\303\277\302\261\303\251\303\235\302\266\027\302\245\302\212w\303\277\302\272{.n\303\207+\302\211\302\267\302\245\302\212{\302\261\303\276G\302\253\302\235\303\251\303\277\302\212{ay\302\272\035\303\212\302\207\303\232\302\231\303\253,j\a\302\255\302\242f\302\243\302\242\302\267h\302\232\302\217\303\257\302\201\303\252\303\277\302\221\303\252\303\247z_\303\250\302\256\003(\302\255\303\251\302\232\302\216\302\212\303\235\302\242j\"\302\235\303\272\032\302\266\033m\302\247\303\277\303\277\302\276\a\302\253\303\276G\302\253\302\235\303\251\303\277\302\242\302\270?\302\231\302\250\303\250\302\255\303\232&\302\243\303\270\302\247~\302\217\303\241\302\266iO\302\225\303\246\302\254z\302\267\302\232v\303\230^\024\004\032\302\266\033m\302\247\303\277\303\277\303\203\f\303\277\302\266\303\254\303\277\302\242\302\270?\302\226I\302\245" -d27e0441a6eb5d2a8259821222b0f7cfa4601a659ae078cf01fccc0e7a604a7c +ec4c11fa3f814e2bb974d6c733c1fa583a8772c50950deecf0aeb0c6b5f4b7b6
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.