summaryrefslogtreecommitdiff
path: root/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1
diff options
context:
space:
mode:
Diffstat (limited to 'packages/linux/mnci-ramses-2.4.21-rmk2-pxa1')
-rw-r--r--packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/.mtn2git_empty0
-rw-r--r--packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/diff-2.4.21-rmk2-pxa1.gzbin0 -> 248024 bytes
-rw-r--r--packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch704
3 files changed, 352 insertions, 352 deletions
diff --git a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/.mtn2git_empty b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/.mtn2git_empty
diff --git a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/diff-2.4.21-rmk2-pxa1.gz b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/diff-2.4.21-rmk2-pxa1.gz
index e69de29bb2..b11188efc1 100644
--- a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/diff-2.4.21-rmk2-pxa1.gz
+++ b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/diff-2.4.21-rmk2-pxa1.gz
Binary files differ
diff --git a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch
index d617ac80ce..efeba8c284 100644
--- a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch
+++ b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch
@@ -6547,7 +6547,7 @@
+++ linux-2.4.21/drivers/bluetooth/hci_usb.c
@@ -30,7 +30,7 @@
*
- * $Id$
+ * $Id: hci_usb.c,v 1.8 2002/07/18 17:23:09 maxk Exp $
*/
-#define VERSION "2.4"
+#define VERSION "2.7"
@@ -15327,8 +15327,8 @@
+++ linux-2.4.21/drivers/mtd/Config.in
@@ -1,5 +1,5 @@
--# $Id$
-+# $Id$
+-# $Id: Config.in,v 1.74 2002/04/23 13:52:14 mag Exp $
++# $Id: Config.in,v 1.78 2004/08/09 18:46:03 dmarlin Exp $
mainmenu_option next_comment
comment 'Memory Technology Devices (MTD)'
@@ -15372,7 +15372,7 @@
-# Note 2! The CFLAGS definitions are now inherited from the
-# parent makes..
-#
--# $Id$
+-# $Id: Makefile,v 1.65 2002/03/22 07:10:34 dwmw2 Exp $
-
-
-obj-y += chips/chipslink.o maps/mapslink.o \
@@ -15407,7 +15407,7 @@
+# Makefile for obsolete kernels.
#
-# dwmw2 21/11/0
-+# $Id$
++# $Id: Makefile.24,v 1.3 2004/08/11 14:45:53 dmarlin Exp $
# Core functionality.
-obj-$(CONFIG_MTD) += mtdcore.o
@@ -15469,7 +15469,7 @@
+#
+# Makefile for the memory technology device drivers.
+#
-+# $Id$
++# $Id: Makefile.common,v 1.5 2004/08/10 20:51:49 dwmw2 Exp $
+
+# Core functionality.
+mtd-y := mtdcore.o
@@ -15499,8 +15499,8 @@
This is access code for flashes using ARM's flash partitioning
standards.
-- $Id$
-+ $Id$
+- $Id: afs.c,v 1.8 2002/05/04 08:49:09 rmk Exp $
++ $Id: afs.c,v 1.13 2004/02/27 22:09:59 rmk Exp $
======================================================================*/
@@ -15679,8 +15679,8 @@
@@ -1,6 +1,6 @@
# drivers/mtd/chips/Config.in
--# $Id$
-+# $Id$
+-# $Id: Config.in,v 1.16 2002/09/03 13:30:43 joern Exp $
++# $Id: Config.in,v 1.20 2004/08/09 18:46:03 dmarlin Exp $
mainmenu_option next_comment
@@ -15740,8 +15740,8 @@
+# linux/drivers/chips/Makefile.24
+# Makefile for obsolete kernels.
#
--# $Id$
-+# $Id$
+-# $Id: Makefile,v 1.8 2002/01/10 20:27:40 eric Exp $
++# $Id: Makefile.24,v 1.1 2004/07/12 16:08:16 dwmw2 Exp $
O_TARGET := chipslink.o
+export-objs := chipreg.o gen_probe.o cfi_util.o
@@ -15777,7 +15777,7 @@
+#
+# linux/drivers/chips/Makefile
+#
-+# $Id$
++# $Id: Makefile.common,v 1.4 2004/07/12 16:07:30 dwmw2 Exp $
+
+# *** BIG UGLY NOTE ***
+#
@@ -15806,8 +15806,8 @@
*
* Author: Jonas Holmberg <jonas.holmberg@axis.com>
*
-- * $Id$
-+ * $Id$
+- * $Id: amd_flash.c,v 1.19 2003/01/24 13:30:11 dwmw2 Exp $
++ * $Id: amd_flash.c,v 1.27 2005/02/04 07:43:09 jonashg Exp $
*
* Copyright (c) 2001 Axis Communications AB
*
@@ -16361,8 +16361,8 @@
*
* (C) 2000 Red Hat. GPL'd
*
-- * $Id$
-+ * $Id$
+- * $Id: cfi_cmdset_0001.c,v 1.114 2003/03/18 12:28:40 dwmw2 Exp $
++ * $Id: cfi_cmdset_0001.c,v 1.168 2005/02/17 20:34:59 nico Exp $
*
*
* 10/10/2000 Nicolas Pitre <nico@cam.org>
@@ -19357,8 +19357,8 @@
+ *
* This code is GPL
*
-- * $Id$
-+ * $Id$
+- * $Id: cfi_cmdset_0002.c,v 1.62 2003/01/24 23:30:13 dwmw2 Exp $
++ * $Id: cfi_cmdset_0002.c,v 1.114 2004/12/11 15:43:53 dedekind Exp $
*
*/
@@ -21180,7 +21180,7 @@
*
* (C) 2000 Red Hat. GPL'd
*
-+ * $Id$
++ * $Id: cfi_cmdset_0020.c,v 1.17 2004/11/20 12:49:04 dwmw2 Exp $
*
* 10/10/2000 Nicolas Pitre <nico@cam.org>
* - completely revamped method functions so they are aware and
@@ -21907,8 +21907,8 @@
/*
Common Flash Interface probe code.
(C) 2000 Red Hat. GPL'd.
-- $Id$
-+ $Id$
+- $Id: cfi_probe.c,v 1.69 2002/05/11 22:13:03 dwmw2 Exp $
++ $Id: cfi_probe.c,v 1.83 2004/11/16 18:19:02 nico Exp $
*/
#include <linux/config.h>
@@ -22293,7 +22293,7 @@
+ *
+ * This code is covered by the GPL.
+ *
-+ * $Id$
++ * $Id: cfi_util.c,v 1.8 2004/12/14 19:55:56 nico Exp $
+ *
+ */
+
@@ -22484,8 +22484,8 @@
+++ linux-2.4.21/drivers/mtd/chips/chipreg.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: chipreg.c,v 1.13 2002/02/21 08:26:58 dwmw2 Exp $
++ * $Id: chipreg.c,v 1.18 2005/01/12 22:34:34 gleixner Exp $
*
* Registration for chip drivers
*
@@ -22689,8 +22689,8 @@
- * (C) 2001, 2001 Red Hat, Inc.
+ * (C) 2001-2003 Red Hat, Inc.
* GPL'd
-- * $Id$
-+ * $Id$
+- * $Id: gen_probe.c,v 1.9 2002/09/05 05:15:32 acurtis Exp $
++ * $Id: gen_probe.c,v 1.22 2005/01/24 23:49:50 rmk Exp $
*/
#include <linux/kernel.h>
@@ -22989,8 +22989,8 @@
* not going to guess how to send commands to them, plus I expect they will
* all speak CFI..
*
-- * $Id$
-+ * $Id$
+- * $Id: jedec.c,v 1.14 2002/06/27 02:19:12 dwmw2 Exp $
++ * $Id: jedec.c,v 1.22 2005/01/05 18:05:11 dwmw2 Exp $
*/
+#include <linux/init.h>
@@ -23364,8 +23364,8 @@
/*
Common Flash Interface probe code.
(C) 2000 Red Hat. GPL'd.
-- $Id$
-+ $Id$
+- $Id: jedec_probe.c,v 1.19 2002/11/12 13:12:10 dwmw2 Exp $
++ $Id: jedec_probe.c,v 1.63 2005/02/14 16:30:32 bjd Exp $
See JEDEC (http://www.jedec.org/) standard JESD21C (section 3.5)
for the standard this probe goes back to.
+
@@ -26047,8 +26047,8 @@
/*
* Common code to handle absent "placeholder" devices
* Copyright 2001 Resilience Corporation <ebrower@resilience.com>
-- * $Id$
-+ * $Id$
+- * $Id: map_absent.c,v 1.2 2001/10/02 15:05:12 dwmw2 Exp $
++ * $Id: map_absent.c,v 1.5 2004/11/16 18:29:00 dwmw2 Exp $
*
* This map driver is used to allocate "placeholder" MTD
* devices on systems that have socketed/removable media.
@@ -26104,8 +26104,8 @@
/*
* Common code to handle map devices which are simple RAM
* (C) 2000 Red Hat. GPL'd.
-- * $Id$
-+ * $Id$
+- * $Id: map_ram.c,v 1.14 2001/10/02 15:05:12 dwmw2 Exp $
++ * $Id: map_ram.c,v 1.22 2005/01/05 18:05:12 dwmw2 Exp $
*/
#include <linux/module.h>
@@ -26234,8 +26234,8 @@
/*
* Common code to handle map devices which are simple ROM
* (C) 2000 Red Hat. GPL'd.
-- * $Id$
-+ * $Id$
+- * $Id: map_rom.c,v 1.17 2001/10/02 15:05:12 dwmw2 Exp $
++ * $Id: map_rom.c,v 1.23 2005/01/05 18:05:12 dwmw2 Exp $
*/
-#include <linux/version.h>
@@ -26307,8 +26307,8 @@
* Copyright 2000,2001 David A. Schleef <ds@schleef.org>
* 2000,2001 Lineo, Inc.
*
-- * $Id$
-+ * $Id$
+- * $Id: sharp.c,v 1.8 2002/05/17 08:59:19 dwmw2 Exp $
++ * $Id: sharp.c,v 1.14 2004/08/09 13:19:43 dwmw2 Exp $
*
* Devices supported:
* LH28F016SCT Symmetrical block flash memory, 2Mx8
@@ -26570,8 +26570,8 @@
+++ linux-2.4.21/drivers/mtd/cmdlinepart.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: cmdlinepart.c,v 1.6 2002/11/16 01:37:39 dneuer Exp $
++ * $Id: cmdlinepart.c,v 1.17 2004/11/26 11:18:47 lavinen Exp $
*
* Read flash partition table from command line
*
@@ -26709,8 +26709,8 @@
-# drivers/mtd/maps/Config.in
+# drivers/mtd/devices/Config.in
--# $Id$
-+# $Id$
+-# $Id: Config.in,v 1.8 2003/01/24 23:25:14 dwmw2 Exp $
++# $Id: Config.in,v 1.15 2004/10/01 21:47:13 gleixner Exp $
mainmenu_option next_comment
@@ -26781,8 +26781,8 @@
+# linux/drivers/maps/Makefile.24
+# Makefile for obsolete kernels
#
--# $Id$
-+# $Id$
+-# $Id: Makefile,v 1.4 2001/06/26 21:10:05 spse Exp $
++# $Id: Makefile.24,v 1.2 2004/08/09 18:46:04 dmarlin Exp $
O_TARGET := devlink.o
+export-objs := docecc.o
@@ -26818,7 +26818,7 @@
+#
+# linux/drivers/devices/Makefile
+#
-+# $Id$
++# $Id: Makefile.common,v 1.7 2004/12/22 17:51:15 joern Exp $
+
+# *** BIG UGLY NOTE ***
+#
@@ -26844,7 +26844,7 @@
+++ linux-2.4.21/drivers/mtd/devices/blkmtd-24.c
@@ -0,0 +1,1056 @@
+/*
-+ * $Id$
++ * $Id: blkmtd-24.c,v 1.23 2004/08/09 18:49:42 dmarlin Exp $
+ *
+ * blkmtd.c - use a block device as a fake MTD
+ *
@@ -27903,8 +27903,8 @@
+++ linux-2.4.21/drivers/mtd/devices/blkmtd.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: blkmtd.c,v 1.17 2003/01/24 13:00:24 dwmw2 Exp $
++ * $Id: blkmtd.c,v 1.24 2004/11/16 18:29:01 dwmw2 Exp $
*
* blkmtd.c - use a block device as a fake MTD
*
@@ -27953,7 +27953,7 @@
+/* Default erase size in K, always make it a multiple of PAGE_SIZE */
#define CONFIG_MTD_BLKDEV_ERASESIZE (128 << 10) /* 128KiB */
-#define VERSION "1.10"
-+#define VERSION "$Revision$"
++#define VERSION "$Revision: 1.24 $"
/* Info for the block device */
struct blkmtd_dev {
@@ -29015,7 +29015,7 @@
+++ linux-2.4.21/drivers/mtd/devices/block2mtd.c
@@ -0,0 +1,494 @@
+/*
-+ * $Id$
++ * $Id: block2mtd.c,v 1.25 2005/03/07 20:29:05 joern Exp $
+ *
+ * block2mtd.c - create an mtd from a block device
+ *
@@ -29035,7 +29035,7 @@
+#include <linux/mtd/mtd.h>
+#include <linux/buffer_head.h>
+
-+#define VERSION "$Revision$"
++#define VERSION "$Revision: 1.25 $"
+
+
+#define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args)
@@ -29514,8 +29514,8 @@
* (c) 1999 Machine Vision Holdings, Inc.
* (c) 1999, 2000 David Woodhouse <dwmw2@infradead.org>
*
-- * $Id$
-+ * $Id$
+- * $Id: doc2000.c,v 1.50 2002/12/10 15:05:42 gleixner Exp $
++ * $Id: doc2000.c,v 1.66 2005/01/05 18:05:12 dwmw2 Exp $
*/
#include <linux/kernel.h>
@@ -30220,8 +30220,8 @@
* (c) 1999 Machine Vision Holdings, Inc.
* (c) 1999, 2000 David Woodhouse <dwmw2@infradead.org>
*
-- * $Id$
-+ * $Id$
+- * $Id: doc2001.c,v 1.38 2002/12/10 15:05:42 gleixner Exp $
++ * $Id: doc2001.c,v 1.48 2005/01/05 18:05:12 dwmw2 Exp $
*/
#include <linux/kernel.h>
@@ -30499,7 +30499,7 @@
+ * (c) 1999 Machine Vision Holdings, Inc.
+ * (c) 1999, 2000 David Woodhouse <dwmw2@infradead.org>
+ *
-+ * $Id$
++ * $Id: doc2001plus.c,v 1.13 2005/01/05 18:05:12 dwmw2 Exp $
+ *
+ * Released under GPL
+ */
@@ -31651,8 +31651,8 @@
* Author: Fabrice Bellard (fabrice.bellard@netgem.com)
* Copyright (C) 2000 Netgem S.A.
*
-- * $Id$
-+ * $Id$
+- * $Id: docecc.c,v 1.4 2001/10/02 15:05:13 dwmw2 Exp $
++ * $Id: docecc.c,v 1.5 2003/05/21 15:15:06 dwmw2 Exp $
*
* 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
@@ -31671,8 +31671,8 @@
/* (C) 1999 Machine Vision Holdings, Inc. */
/* (C) 1999-2003 David Woodhouse <dwmw2@infradead.org> */
--/* $Id$ */
-+/* $Id$ */
+-/* $Id: docprobe.c,v 1.33 2003/01/24 14:02:47 dwmw2 Exp $ */
++/* $Id: docprobe.c,v 1.44 2005/01/05 12:40:36 dwmw2 Exp $ */
@@ -31932,8 +31932,8 @@
/*
* MTD driver for the 28F160F3 Flash Memory (non-CFI) on LART.
*
-- * $Id$
-+ * $Id$
+- * $Id: lart.c,v 1.2 2001/10/02 15:05:13 dwmw2 Exp $
++ * $Id: lart.c,v 1.7 2004/08/09 13:19:44 dwmw2 Exp $
*
* Author: Abraham vd Merwe <abraham@2d3d.co.za>
*
@@ -32036,8 +32036,8 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*
-- * $Id$
-+ * $Id$
+- * $Id: ms02-nv.c,v 1.2 2003/01/24 14:05:17 dwmw2 Exp $
++ * $Id: ms02-nv.c,v 1.8 2005/01/05 18:05:12 dwmw2 Exp $
*/
#include <linux/init.h>
@@ -32147,7 +32147,7 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
+ *
-+ * $Id$
++ * $Id: ms02-nv.h,v 1.3 2003/08/19 09:25:36 dwmw2 Exp $
*/
#include <linux/ioport.h>
@@ -32240,8 +32240,8 @@
@@ -1,6 +1,6 @@
/*
* mtdram - a test mtd device
-- * $Id$
-+ * $Id$
+- * $Id: mtdram.c,v 1.29 2002/10/21 13:40:06 jocke Exp $
++ * $Id: mtdram.c,v 1.35 2005/01/05 18:05:12 dwmw2 Exp $
* Author: Alexander Larsson <alex@cendio.se>
*
* Copyright (c) 1999 Alexander Larsson <alex@cendio.se>
@@ -32317,7 +32317,7 @@
+++ linux-2.4.21/drivers/mtd/devices/phram.c
@@ -0,0 +1,299 @@
+/**
-+ * $Id$
++ * $Id: phram.c,v 1.14 2005/03/07 21:43:38 joern Exp $
+ *
+ * Copyright (c) ???? Jochen Schäuble <psionic@psionic.de>
+ * Copyright (c) 2003-2004 Jörn Engel <joern@wh.fh-wedel.de>
@@ -32619,8 +32619,8 @@
+++ linux-2.4.21/drivers/mtd/devices/pmc551.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: pmc551.c,v 1.22 2003/01/24 13:34:30 dwmw2 Exp $
++ * $Id: pmc551.c,v 1.30 2005/01/05 18:05:13 dwmw2 Exp $
*
* PMC551 PCI Mezzanine Ram Device
*
@@ -32762,8 +32762,8 @@
@@ -1,6 +1,6 @@
/*======================================================================
-- $Id$
-+ $Id$
+- $Id: slram.c,v 1.28 2003/01/24 13:35:34 dwmw2 Exp $
++ $Id: slram.c,v 1.34 2005/01/06 21:16:42 jwboyer Exp $
This driver provides a method to access memory not used by the kernel
itself (i.e. if the kernel commandline mem=xxx is used). To actually
@@ -32947,8 +32947,8 @@
+++ linux-2.4.21/drivers/mtd/ftl.c
@@ -1,5 +1,5 @@
/* This version ported to the Linux-MTD system by dwmw2@infradead.org
-- * $Id$
-+ * $Id$
+- * $Id: ftl.c,v 1.45 2003/01/24 23:31:27 dwmw2 Exp $
++ * $Id: ftl.c,v 1.55 2005/01/17 13:47:21 hvr Exp $
*
* Fixes: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* - fixes some leaks on failure in build_maps and ftl_notify_add, cleanups
@@ -33699,7 +33699,7 @@
-
- memset(myparts, 0, sizeof(myparts));
-
-- DEBUG(0, "$Id$\n");
+- DEBUG(0, "$Id: ftl.c,v 1.45 2003/01/24 23:31:27 dwmw2 Exp $\n");
-
- if (register_blkdev(FTL_MAJOR, "ftl", &ftl_blk_fops)) {
- printk(KERN_NOTICE "ftl_cs: unable to grab major "
@@ -33719,7 +33719,7 @@
- add_gendisk(&ftl_gendisk);
-
- register_mtd_user(&ftl_notifier);
-+ DEBUG(0, "$Id$\n");
++ DEBUG(0, "$Id: ftl.c,v 1.55 2005/01/17 13:47:21 hvr Exp $\n");
- return 0;
+ return register_mtd_blktrans(&ftl_tr);
@@ -33750,7 +33750,7 @@
+ * (c) 1999 Machine Vision Holdings, Inc.
+ * Author: David Woodhouse <dwmw2@infradead.org>
+ *
-+ * $Id$
++ * $Id: inftlcore.c,v 1.18 2004/11/16 18:28:59 dwmw2 Exp $
+ *
+ * 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
@@ -34636,7 +34636,7 @@
+
+static int __init init_inftl(void)
+{
-+ printk(KERN_INFO "INFTL: inftlcore.c $Revision$, "
++ printk(KERN_INFO "INFTL: inftlcore.c $Revision: 1.18 $, "
+ "inftlmount.c %s\n", inftlmountrev);
+
+ return register_mtd_blktrans(&inftl_tr);
@@ -34666,7 +34666,7 @@
+ * Author: Fabrice Bellard (fabrice.bellard@netgem.com)
+ * Copyright (C) 2000 Netgem S.A.
+ *
-+ * $Id$
++ * $Id: inftlmount.c,v 1.16 2004/11/22 13:50:53 kalev Exp $
+ *
+ * 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
@@ -34699,7 +34699,7 @@
+#include <linux/mtd/inftl.h>
+#include <linux/mtd/compatmac.h>
+
-+char inftlmountrev[]="$Revision$";
++char inftlmountrev[]="$Revision: 1.16 $";
+
+/*
+ * find_boot_record: Find the INFTL Media Header and its Spare copy which
@@ -35465,8 +35465,8 @@
@@ -1,16 +1,18 @@
# drivers/mtd/maps/Config.in
--# $Id$
-+# $Id$
+-# $Id: Config.in,v 1.43 2003/01/24 14:26:38 dwmw2 Exp $
++# $Id: Config.in,v 1.72 2005/02/27 21:50:21 ppopov Exp $
mainmenu_option next_comment
@@ -35622,8 +35622,8 @@
+# linux/drivers/maps/Makefile.24
+# Makefile for obsolete kernels
#
--# $Id$
-+# $Id$
+-# $Id: Makefile,v 1.37 2003/01/24 14:26:38 dwmw2 Exp $
++# $Id: Makefile.24,v 1.1 2004/07/12 16:08:16 dwmw2 Exp $
O_TARGET := mapslink.o
+export-objs := map_funcs.o
@@ -35695,7 +35695,7 @@
+#
+# linux/drivers/maps/Makefile
+#
-+# $Id$
++# $Id: Makefile.common,v 1.27 2005/03/07 23:15:48 joern Exp $
+
+ifeq ($(CONFIG_MTD_COMPLEX_MAPPINGS),y)
+obj-$(CONFIG_MTD) += map_funcs.o
@@ -35771,8 +35771,8 @@
* amd76xrom.c
*
* Normal mappings of chips in physical memory
-- * $Id$
-+ * $Id$
+- * $Id: amd76xrom.c,v 1.1 2002/10/18 22:45:48 eric Exp $
++ * $Id: amd76xrom.c,v 1.19 2004/11/28 09:40:39 dwmw2 Exp $
*/
#include <linux/module.h>
@@ -36241,7 +36241,7 @@
+++ linux-2.4.21/drivers/mtd/maps/arctic-mtd.c
@@ -0,0 +1,135 @@
+/*
-+ * $Id$
++ * $Id: arctic-mtd.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $
+ *
+ * drivers/mtd/maps/arctic-mtd.c MTD mappings and partition tables for
+ * IBM 405LP Arctic boards.
@@ -36381,8 +36381,8 @@
* NV-RAM memory access on autcpu12
* (C) 2002 Thomas Gleixner (gleixner@autronix.de)
*
-- * $Id$
-+ * $Id$
+- * $Id: autcpu12-nvram.c,v 1.1 2002/02/22 09:30:24 gleixner Exp $
++ * $Id: autcpu12-nvram.c,v 1.8 2004/11/04 13:24:14 gleixner Exp $
*
* 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
@@ -36559,7 +36559,7 @@
+ * 20-Sep-2004 BJD Initial version
+ * 17-Jan-2005 BJD Add whole device if no partitions found
+ *
-+ * $Id$
++ * $Id: bast-flash.c,v 1.2 2005/01/18 11:13:47 bjd Exp $
+ *
+ * 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
@@ -36782,7 +36782,7 @@
+++ linux-2.4.21/drivers/mtd/maps/beech-mtd.c
@@ -0,0 +1,112 @@
+/*
-+ * $Id$
++ * $Id: beech-mtd.c,v 1.10 2004/11/04 13:24:14 gleixner Exp $
+ *
+ * drivers/mtd/maps/beech-mtd.c MTD mappings and partition tables for
+ * IBM 405LP Beech boards.
@@ -36899,8 +36899,8 @@
/*
* Flash on Cirrus CDB89712
*
-- * $Id$
-+ * $Id$
+- * $Id: cdb89712.c,v 1.3 2001/10/02 15:14:43 rmk Exp $
++ * $Id: cdb89712.c,v 1.10 2004/11/04 13:24:14 gleixner Exp $
*/
#include <linux/module.h>
@@ -37195,8 +37195,8 @@
*
* (C) 2000 Nicolas Pitre <nico@cam.org>
*
-- * $Id$
-+ * $Id$
+- * $Id: ceiva.c,v 1.2 2002/10/14 12:50:22 rmk Exp $
++ * $Id: ceiva.c,v 1.11 2004/09/16 23:27:12 gleixner Exp $
*/
#include <linux/config.h>
@@ -37390,8 +37390,8 @@
/*
* Copyright © 2001 Flaga hf. Medical Devices, Kári Davíđsson <kd@flaga.is>
*
-- * $Id$
-+ * $Id$
+- * $Id: cfi_flagadm.c,v 1.7 2001/10/02 15:05:13 dwmw2 Exp $
++ * $Id: cfi_flagadm.c,v 1.14 2004/11/04 13:24:14 gleixner Exp $
*
* 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
@@ -37552,7 +37552,7 @@
+/*
+ * drivers/mtd/maps/chestnut.c
+ *
-+ * $Id$
++ * $Id: chestnut.c,v 1.1 2005/01/05 16:59:50 dwmw2 Exp $
+ *
+ * Flash map driver for IBM Chestnut (750FXGX Eval)
+ *
@@ -37644,8 +37644,8 @@
+++ linux-2.4.21/drivers/mtd/maps/cstm_mips_ixx.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: cstm_mips_ixx.c,v 1.5 2001/10/02 15:05:14 dwmw2 Exp $
++ * $Id: cstm_mips_ixx.c,v 1.13 2005/01/12 22:34:35 gleixner Exp $
*
* Mapping of a custom board with both AMD CFI and JEDEC flash in partitions.
* Config with both CFI and JEDEC device support.
@@ -37878,8 +37878,8 @@
+++ linux-2.4.21/drivers/mtd/maps/dbox2-flash.c
@@ -1,37 +1,61 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: dbox2-flash.c,v 1.4 2001/10/02 15:05:14 dwmw2 Exp $
++ * $Id: dbox2-flash.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $
*
- * Nokia / Sagem D-Box 2 flash driver
+ * D-Box 2 flash driver
@@ -38086,8 +38086,8 @@
*
* This code is GPL
*
-- * $Id$
-+ * $Id$
+- * $Id: dc21285.c,v 1.9 2002/10/14 12:22:10 rmk Exp $
++ * $Id: dc21285.c,v 1.22 2004/11/01 13:39:21 rmk Exp $
*/
#include <linux/config.h>
#include <linux/module.h>
@@ -38407,8 +38407,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
-- * $Id$
-+ * $Id$
+- * $Id: dilnetpc.c,v 1.8 2002/03/12 13:07:26 rkaiser Exp $
++ * $Id: dilnetpc.c,v 1.18 2005/01/12 22:34:35 gleixner Exp $
*
* The DIL/Net PC is a tiny embedded PC board made by SSV Embedded Systems
* featuring the AMD Elan SC410 processor. There are two variants of this
@@ -38647,7 +38647,7 @@
+ *
+ * Flash map driver for the Dy4 SVME182 board
+ *
-+ * $Id$
++ * $Id: dmv182.c,v 1.5 2004/11/04 13:24:14 gleixner Exp $
+ *
+ * Copyright 2003-2004, TimeSys Corporation
+ *
@@ -38794,7 +38794,7 @@
+++ linux-2.4.21/drivers/mtd/maps/ebony.c
@@ -0,0 +1,163 @@
+/*
-+ * $Id$
++ * $Id: ebony.c,v 1.15 2004/12/09 18:39:54 holindho Exp $
+ *
+ * Mapping for Ebony user flash
+ *
@@ -38960,8 +38960,8 @@
+++ linux-2.4.21/drivers/mtd/maps/edb7312.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: edb7312.c,v 1.2 2002/09/05 05:11:24 acurtis Exp $
++ * $Id: edb7312.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $
*
* Handle mapping of the NOR flash on Cogent EDB7312 boards
*
@@ -39163,7 +39163,7 @@
+ * Copyright (C) 2001 Altera Corporation
+ * Copyright (C) 2001 Red Hat, Inc.
+ *
-+ * $Id$
++ * $Id: epxa10db-flash.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $
+ *
+ * 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
@@ -39337,8 +39337,8 @@
@@ -1,11 +1,12 @@
/* fortunet.c memory map
*
-- * $Id$
-+ * $Id$
+- * $Id: fortunet.c,v 1.2 2002/10/14 12:50:22 rmk Exp $
++ * $Id: fortunet.c,v 1.9 2004/11/04 13:24:14 gleixner Exp $
*/
#include <linux/module.h>
@@ -39588,7 +39588,7 @@
+ * Flash memory access on Hynix GMS30C7201/HMS30C7202 based
+ * evaluation boards
+ *
-+ * $Id$
++ * $Id: h720x-flash.c,v 1.11 2004/11/04 13:24:14 gleixner Exp $
+ *
+ * (C) 2002 Jungjun Kim <jungjun.kim@hynix.com>
+ * 2003 Thomas Gleixner <tglx@linutronix.de>
@@ -39735,7 +39735,7 @@
+ * ichxrom.c
+ *
+ * Normal mappings of chips in physical memory
-+ * $Id$
++ * $Id: ichxrom.c,v 1.16 2004/11/28 09:40:39 dwmw2 Exp $
+ */
+
+#include <linux/module.h>
@@ -40118,8 +40118,8 @@
+++ linux-2.4.21/drivers/mtd/maps/impa7.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: impa7.c,v 1.2 2002/09/05 05:11:24 acurtis Exp $
++ * $Id: impa7.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $
*
* Handle mapping of the NOR flash on implementa A7 boards
*
@@ -40392,7 +40392,7 @@
+ This is access code for flashes using ARM's flash partitioning
+ standards.
+
-+ $Id$
++ $Id: integrator-flash-v24.c,v 1.14 2004/09/16 23:27:13 gleixner Exp $
+
+======================================================================*/
+
@@ -40644,8 +40644,8 @@
This is access code for flashes using ARM's flash partitioning
standards.
-- $Id$
-+ $Id$
+- $Id: integrator-flash.c,v 1.7 2001/11/01 20:55:47 rmk Exp $
++ $Id: integrator-flash.c,v 1.18 2004/11/01 13:26:15 rmk Exp $
======================================================================*/
@@ -41045,7 +41045,7 @@
+ * (C) 2002 Hewlett-Packard Company <jamey.hicks@hp.com>
+ * (C) 2003 Christian Pellegrin <chri@ascensit.com>, <chri@infis.univ.ts.it>: concatenation of multiple flashes
+ *
-+ * $Id$
++ * $Id: ipaq-flash.c,v 1.4 2005/01/12 22:34:35 gleixner Exp $
+ */
+
+#include <linux/config.h>
@@ -41506,8 +41506,8 @@
+++ linux-2.4.21/drivers/mtd/maps/iq80310.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: iq80310.c,v 1.9 2002/01/01 22:45:02 rmk Exp $
++ * $Id: iq80310.c,v 1.20 2004/11/04 13:24:15 gleixner Exp $
*
* Mapping for the Intel XScale IQ80310 evaluation board
*
@@ -41692,7 +41692,7 @@
+++ linux-2.4.21/drivers/mtd/maps/ixp2000.c
@@ -0,0 +1,280 @@
+/*
-+ * $Id$
++ * $Id: ixp2000.c,v 1.5 2004/11/16 17:15:48 dsaxena Exp $
+ *
+ * drivers/mtd/maps/ixp2000.c
+ *
@@ -41975,7 +41975,7 @@
+++ linux-2.4.21/drivers/mtd/maps/ixp4xx.c
@@ -0,0 +1,259 @@
+/*
-+ * $Id$
++ * $Id: ixp4xx.c,v 1.7 2004/11/04 13:24:15 gleixner Exp $
+ *
+ * drivers/mtd/maps/ixp4xx.c
+ *
@@ -42237,8 +42237,8 @@
+++ linux-2.4.21/drivers/mtd/maps/l440gx.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: l440gx.c,v 1.8 2002/01/10 20:27:40 eric Exp $
++ * $Id: l440gx.c,v 1.17 2004/11/28 09:40:39 dwmw2 Exp $
*
* BIOS Flash chip on Intel 440GX board.
*
@@ -42410,8 +42410,8 @@
* modify it under the terms of the GNU General Public License version
* 2 as published by the Free Software Foundation.
*
-- * $Id$
-+ * $Id$
+- * $Id: lasat.c,v 1.1 2003/01/24 14:26:38 dwmw2 Exp $
++ * $Id: lasat.c,v 1.9 2004/11/04 13:24:15 gleixner Exp $
*
*/
@@ -42581,7 +42581,7 @@
+++ linux-2.4.21/drivers/mtd/maps/lubbock-flash.c
@@ -0,0 +1,168 @@
+/*
-+ * $Id$
++ * $Id: lubbock-flash.c,v 1.19 2004/11/04 13:24:15 gleixner Exp $
+ *
+ * Map driver for the Lubbock developer platform.
+ *
@@ -42752,7 +42752,7 @@
+++ linux-2.4.21/drivers/mtd/maps/map_funcs.c
@@ -0,0 +1,44 @@
+/*
-+ * $Id$
++ * $Id: map_funcs.c,v 1.9 2004/07/13 22:33:15 dwmw2 Exp $
+ *
+ * Out-of-line map I/O functions for simple maps when CONFIG_COMPLEX_MAPPINGS
+ * is enabled.
@@ -42799,8 +42799,8 @@
+++ linux-2.4.21/drivers/mtd/maps/mbx860.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: mbx860.c,v 1.1 2001/11/18 19:43:09 dwmw2 Exp $
++ * $Id: mbx860.c,v 1.8 2004/11/04 13:24:15 gleixner Exp $
*
* Handle mapping of the flash on MBX860 boards
*
@@ -42942,7 +42942,7 @@
+/*
+ * Flash on MPC-1211
+ *
-+ * $Id$
++ * $Id: mpc1211.c,v 1.4 2004/09/16 23:27:13 gleixner Exp $
+ *
+ * (C) 2002 Interface, Saito.K & Jeanne
+ *
@@ -43024,7 +43024,7 @@
+++ linux-2.4.21/drivers/mtd/maps/mphysmap.c
@@ -0,0 +1,282 @@
+/*
-+ * $Id$
++ * $Id: mphysmap.c,v 1.2 2005/03/07 23:15:48 joern Exp $
+ *
+ * Several mappings of NOR chips
+ *
@@ -43311,8 +43311,8 @@
* Copyright (C) 2001 Mark Langsdorf (mark.langsdorf@amd.com)
* based on sc520cdp.c by Sysgo Real-Time Solutions GmbH
*
-- * $Id$
-+ * $Id$
+- * $Id: netsc520.c,v 1.5 2001/10/02 15:05:14 dwmw2 Exp $
++ * $Id: netsc520.c,v 1.13 2004/11/28 09:40:40 dwmw2 Exp $
*
* 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
@@ -43489,8 +43489,8 @@
* (C) Copyright 2000-2001, Greg Ungerer (gerg@snapgear.com)
* (C) Copyright 2001-2002, SnapGear (www.snapgear.com)
*
-- * $Id$
-+ * $Id$
+- * $Id: nettel.c,v 1.1 2002/08/08 06:30:13 gerg Exp $
++ * $Id: nettel.c,v 1.10 2005/01/05 17:11:29 dwmw2 Exp $
*/
/****************************************************************************/
@@ -43785,8 +43785,8 @@
+++ linux-2.4.21/drivers/mtd/maps/ocelot.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: ocelot.c,v 1.6 2001/10/02 15:05:14 dwmw2 Exp $
++ * $Id: ocelot.c,v 1.16 2005/01/05 18:05:13 dwmw2 Exp $
*
* Flash on Momenco Ocelot
*/
@@ -44147,8 +44147,8 @@
--- linux-2.4.21/drivers/mtd/maps/octagon-5066.c~mtd-cvs
+++ linux-2.4.21/drivers/mtd/maps/octagon-5066.c
@@ -1,4 +1,4 @@
--// $Id$
-+// $Id$
+-// $Id: octagon-5066.c,v 1.20 2003/01/07 17:21:55 dwmw2 Exp $
++// $Id: octagon-5066.c,v 1.27 2005/01/12 22:34:35 gleixner Exp $
/* ######################################################################
Octagon 5066 MTD Driver.
@@ -44305,7 +44305,7 @@
+ *
+ * (C) 2002 MontVista Software, Inc.
+ *
-+ * $Id$
++ * $Id: omap-toto-flash.c,v 1.3 2004/09/16 23:27:13 gleixner Exp $
+ */
+
+#include <linux/config.h>
@@ -44441,8 +44441,8 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
-- * $Id$
-+ * $Id$
+- * $Id: pci.c,v 1.2 2003/01/24 13:11:43 dwmw2 Exp $
++ * $Id: pci.c,v 1.9 2004/11/28 09:40:40 dwmw2 Exp $
*
* Generic PCI memory map driver. We support the following boards:
* - Intel IQ80310 ATU.
@@ -44756,8 +44756,8 @@
+++ linux-2.4.21/drivers/mtd/maps/pcmciamtd.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: pcmciamtd.c,v 1.39 2003/01/06 17:51:38 spse Exp $
++ * $Id: pcmciamtd.c,v 1.51 2004/07/12 22:38:29 dwmw2 Exp $
*
* pcmciamtd.c - MTD driver for PCMCIA flash memory cards
*
@@ -44781,8 +44781,8 @@
#define DRIVER_DESC "PCMCIA Flash memory card driver"
--#define DRIVER_VERSION "$Revision$"
-+#define DRIVER_VERSION "$Revision$"
+-#define DRIVER_VERSION "$Revision: 1.39 $"
++#define DRIVER_VERSION "$Revision: 1.51 $"
/* Size of the PCMCIA address space: 26 bits = 64 MB */
#define MAX_PCMCIA_ADDR 0x4000000
@@ -45339,8 +45339,8 @@
+++ linux-2.4.21/drivers/mtd/maps/physmap.c
@@ -1,179 +1,119 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: physmap.c,v 1.21 2002/09/05 05:12:54 acurtis Exp $
++ * $Id: physmap.c,v 1.37 2004/11/28 09:40:40 dwmw2 Exp $
*
* Normal mappings of chips in physical memory
+ *
@@ -45586,7 +45586,7 @@
+ *
+ * Generic platfrom device based RAM map
+ *
-+ * $Id$
++ * $Id: plat-ram.c,v 1.1 2005/01/24 00:37:02 bjd Exp $
+ *
+ * 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
@@ -45870,8 +45870,8 @@
*
* This code is GPL
*
-- * $Id$
-+ * $Id$
+- * $Id: pnc2000.c,v 1.10 2001/10/02 15:05:14 dwmw2 Exp $
++ * $Id: pnc2000.c,v 1.17 2004/11/16 18:29:02 dwmw2 Exp $
*/
#include <linux/module.h>
@@ -46134,7 +46134,7 @@
- * 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.
-+ * $Id$
++ * $Id: redwood.c,v 1.10 2004/11/04 13:24:15 gleixner Exp $
*
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -46391,8 +46391,8 @@
+++ linux-2.4.21/drivers/mtd/maps/rpxlite.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: rpxlite.c,v 1.15 2001/10/02 15:05:14 dwmw2 Exp $
++ * $Id: rpxlite.c,v 1.22 2004/11/04 13:24:15 gleixner Exp $
*
* Handle mapping of the flash on the RPX Lite and CLLF boards
*/
@@ -46514,8 +46514,8 @@
*
* (C) 2000 Nicolas Pitre <nico@cam.org>
*
-- * $Id$
-+ * $Id$
+- * $Id: sa1100-flash.c,v 1.29 2002/09/06 14:36:19 abz Exp $
++ * $Id: sa1100-flash.c,v 1.47 2004/11/01 13:44:36 rmk Exp $
*/
#include <linux/config.h>
@@ -48626,7 +48626,7 @@
+ *
+ * This code is GPLed
+ *
-+ * $Id$
++ * $Id: sbc8240.c,v 1.4 2004/07/12 22:38:29 dwmw2 Exp $
+ *
+ */
+
@@ -48872,8 +48872,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-- $Id$
-+ $Id$
+- $Id: sbc_gxx.c,v 1.21 2003/01/24 13:40:14 dwmw2 Exp $
++ $Id: sbc_gxx.c,v 1.34 2005/01/12 22:34:35 gleixner Exp $
The SBC-MediaGX / SBC-GXx has up to 16 MiB of
Intel StrataFlash (28F320/28F640) in x8 mode.
@@ -49063,8 +49063,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
-- * $Id$
-+ * $Id$
+- * $Id: sc520cdp.c,v 1.11 2002/03/08 16:34:35 rkaiser Exp $
++ * $Id: sc520cdp.c,v 1.21 2004/12/13 10:27:08 dedekind Exp $
*
*
* The SC520CDP is an evaluation board for the Elan SC520 processor available
@@ -49265,8 +49265,8 @@
@@ -1,6 +1,6 @@
/*
* MTD map driver for BIOS Flash on Intel SCB2 boards
-- * $Id$
-+ * $Id$
+- * $Id: scb2_flash.c,v 1.2 2003/01/24 13:09:56 dwmw2 Exp $
++ * $Id: scb2_flash.c,v 1.11 2004/11/28 09:40:40 dwmw2 Exp $
* Copyright (C) 2002 Sun Microsystems, Inc.
* Tim Hockin <thockin@sun.com>
*
@@ -49456,8 +49456,8 @@
Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
-- $Id$
-+ $Id$
+- $Id: scx200_docflash.c,v 1.1 2003/01/24 13:20:40 dwmw2 Exp $
++ $Id: scx200_docflash.c,v 1.10 2004/11/28 09:40:40 dwmw2 Exp $
National Semiconductor SCx200 flash mapped with DOCCS
*/
@@ -49578,7 +49578,7 @@
+ * Copyright (C) 2001 Lineo Japan, Inc.
+ * Copyright (C) 2002 SHARP
+ *
-+ * $Id$
++ * $Id: sharpsl-flash.c,v 1.2 2004/11/24 20:38:06 rpurdie Exp $
+ *
+ * based on rpxlite.c,v 1.15 2001/10/02 15:05:14 dwmw2 Exp
+ * Handle mapping of the flash on the RPX Lite and CLLF boards
@@ -49677,8 +49677,8 @@
+++ linux-2.4.21/drivers/mtd/maps/solutionengine.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: solutionengine.c,v 1.4 2001/11/07 01:20:59 jsiegel Exp $
++ * $Id: solutionengine.c,v 1.14 2004/09/16 23:27:14 gleixner Exp $
*
* Flash and EPROM on Hitachi Solution Engine and similar boards.
*
@@ -49831,8 +49831,8 @@
--- linux-2.4.21/drivers/mtd/maps/sun_uflash.c~mtd-cvs
+++ linux-2.4.21/drivers/mtd/maps/sun_uflash.c
@@ -1,4 +1,4 @@
--/* $Id$
-+/* $Id$
+-/* $Id: sun_uflash.c,v 1.4 2001/10/02 15:05:14 dwmw2 Exp $
++/* $Id: sun_uflash.c,v 1.11 2004/11/04 13:24:15 gleixner Exp $
*
* sun_uflash - Driver implementation for user-programmable flash
* present on many Sun Microsystems SME boardsets.
@@ -49963,8 +49963,8 @@
* Handle mapping of the flash memory access routines
* on TQM8xxL based devices.
*
-- * $Id$
-+ * $Id$
+- * $Id: tqm8xxl.c,v 1.4 2002/06/20 13:41:20 mag Exp $
++ * $Id: tqm8xxl.c,v 1.13 2004/10/20 22:21:53 dwmw2 Exp $
*
* based on rpxlite.c
*
@@ -50300,7 +50300,7 @@
+ * - If you have created your own jffs file system and the bios overwrites
+ * it during boot, try disabling Drive A: and B: in the boot order.
+ *
-+ * $Id$
++ * $Id: ts5500_flash.c,v 1.2 2004/11/28 09:40:40 dwmw2 Exp $
+ */
+
+#include <linux/config.h>
@@ -50420,8 +50420,8 @@
* tsunami_flash.c
*
* flash chip on alpha ds10...
-- * $Id$
-+ * $Id$
+- * $Id: tsunami_flash.c,v 1.1 2002/01/10 22:59:13 eric Exp $
++ * $Id: tsunami_flash.c,v 1.9 2004/07/14 09:52:55 dwmw2 Exp $
*/
#include <asm/io.h>
#include <asm/core_tsunami.h>
@@ -50498,8 +50498,8 @@
*
* (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
*
-- * $Id$
-+ * $Id$
+- * $Id: uclinux.c,v 1.2 2002/08/07 00:43:45 gerg Exp $
++ * $Id: uclinux.c,v 1.10 2005/01/05 18:05:13 dwmw2 Exp $
*/
/****************************************************************************/
@@ -50643,8 +50643,8 @@
--- linux-2.4.21/drivers/mtd/maps/vmax301.c~mtd-cvs
+++ linux-2.4.21/drivers/mtd/maps/vmax301.c
@@ -1,4 +1,4 @@
--// $Id$
-+// $Id$
+-// $Id: vmax301.c,v 1.24 2001/10/02 15:05:14 dwmw2 Exp $
++// $Id: vmax301.c,v 1.31 2005/01/12 22:34:35 gleixner Exp $
/* ######################################################################
Tempustech VMAX SBC301 MTD Driver.
@@ -50810,7 +50810,7 @@
+++ linux-2.4.21/drivers/mtd/maps/walnut.c
@@ -0,0 +1,122 @@
+/*
-+ * $Id$
++ * $Id: walnut.c,v 1.2 2004/12/10 12:07:42 holindho Exp $
+ *
+ * Mapping for Walnut flash
+ * (used ebony.c as a "framework")
@@ -50935,7 +50935,7 @@
+++ linux-2.4.21/drivers/mtd/maps/wr_sbc82xx_flash.c
@@ -0,0 +1,181 @@
+/*
-+ * $Id$
++ * $Id: wr_sbc82xx_flash.c,v 1.7 2004/11/04 13:24:15 gleixner Exp $
+ *
+ * Map for flash chips on Wind River PowerQUICC II SBC82xx board.
+ *
@@ -51119,7 +51119,7 @@
+++ linux-2.4.21/drivers/mtd/mtd_blkdevs-24.c
@@ -0,0 +1,692 @@
+/*
-+ * $Id$
++ * $Id: mtd_blkdevs-24.c,v 1.17 2005/01/05 17:35:22 dwmw2 Exp $
+ *
+ * (C) 2003 David Woodhouse <dwmw2@infradead.org>
+ *
@@ -51814,7 +51814,7 @@
+++ linux-2.4.21/drivers/mtd/mtd_blkdevs.c
@@ -0,0 +1,478 @@
+/*
-+ * $Id$
++ * $Id: mtd_blkdevs.c,v 1.24 2004/11/16 18:28:59 dwmw2 Exp $
+ *
+ * (C) 2003 David Woodhouse <dwmw2@infradead.org>
+ *
@@ -52297,8 +52297,8 @@
/*
* Direct MTD block device access
*
-- * $Id$
-+ * $Id$
+- * $Id: mtdblock.c,v 1.51 2001/11/20 11:42:33 dwmw2 Exp $
++ * $Id: mtdblock.c,v 1.66 2004/11/25 13:52:52 joern Exp $
*
- * 02-nov-2000 Nicolas Pitre Added read-modify-write with cache
+ * (C) 2000-2003 Nicolas Pitre <nico@cam.org>
@@ -52851,8 +52851,8 @@
+++ linux-2.4.21/drivers/mtd/mtdblock_ro.c
@@ -1,301 +1,87 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: mtdblock_ro.c,v 1.12 2001/11/20 11:42:33 dwmw2 Exp $
++ * $Id: mtdblock_ro.c,v 1.19 2004/11/16 18:28:59 dwmw2 Exp $
*
- * Read-only version of the mtdblock device, without the
- * read/erase/modify/writeback stuff
@@ -53206,8 +53206,8 @@
+++ linux-2.4.21/drivers/mtd/mtdchar.c
@@ -1,8 +1,7 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: mtdchar.c,v 1.49 2003/01/24 12:02:58 dwmw2 Exp $
++ * $Id: mtdchar.c,v 1.68 2005/02/08 19:12:50 nico Exp $
*
* Character-device access to raw MTD devices.
- * Pure 2.4 version - compatibility cruft removed to mtdchar-compat.c
@@ -53876,8 +53876,8 @@
+ *
* This code is GPL
*
-- * $Id$
-+ * $Id$
+- * $Id: mtdconcat.c,v 1.3 2002/05/21 21:04:25 dwmw2 Exp $
++ * $Id: mtdconcat.c,v 1.9 2004/06/30 15:17:41 dbrown Exp $
*/
#include <linux/module.h>
@@ -54843,8 +54843,8 @@
+++ linux-2.4.21/drivers/mtd/mtdcore.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: mtdcore.c,v 1.34 2003/01/24 23:32:25 dwmw2 Exp $
++ * $Id: mtdcore.c,v 1.45 2005/02/18 14:34:50 dedekind Exp $
*
* Core registration and callback routines for MTD
* drivers and users.
@@ -55190,8 +55190,8 @@
*
* This code is GPL
*
-- * $Id$
-+ * $Id$
+- * $Id: mtdpart.c,v 1.32 2002/10/21 13:40:05 jocke Exp $
++ * $Id: mtdpart.c,v 1.53 2005/02/08 17:11:13 nico Exp $
*
* 02-21-2002 Thomas Gleixner <gleixner@autronix.de>
* added support for read_oob, write_oob
@@ -55550,8 +55550,8 @@
@@ -1,6 +1,6 @@
# drivers/mtd/nand/Config.in
--# $Id$
-+# $Id$
+-# $Id: Config.in,v 1.11 2002/12/01 13:23:05 gleixner Exp $
++# $Id: Config.in,v 1.24 2005/01/17 18:25:19 dmarlin Exp $
mainmenu_option next_comment
@@ -55631,8 +55631,8 @@
+# linux/drivers/nand/Makefile.24
+# Makefile for obsolete kernels.
#
--# $Id$
-+# $Id$
+-# $Id: Makefile,v 1.10 2002/12/01 13:23:05 gleixner Exp $
++# $Id: Makefile.24,v 1.1 2004/07/12 16:08:17 dwmw2 Exp $
O_TARGET := nandlink.o
+export-objs := nand_base.o nand_bbt.o nand_ecc.o nand_ids.o
@@ -55657,7 +55657,7 @@
+#
+# linux/drivers/nand/Makefile
+#
-+# $Id$
++# $Id: Makefile.common,v 1.15 2004/11/26 12:28:22 dedekind Exp $
+
+obj-$(CONFIG_MTD_NAND) += nand.o nand_ecc.o
+obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o
@@ -55686,7 +55686,7 @@
+ *
+ * Copyright (C) 2004 Embedded Edge, LLC
+ *
-+ * $Id$
++ * $Id: au1550nd.c,v 1.11 2004/11/04 12:53:10 gleixner Exp $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
@@ -56167,8 +56167,8 @@
- * Copyright (C) 2000 Steven J. Hill (sjhill@cotw.com)
+ * Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
*
-- * $Id$
-+ * $Id$
+- * $Id: autcpu12.c,v 1.6 2002/11/11 15:47:56 gleixner Exp $
++ * $Id: autcpu12.c,v 1.22 2004/11/04 12:53:10 gleixner Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -56416,7 +56416,7 @@
+ *
+ * Interface to generic NAND code for M-Systems DiskOnChip devices
+ *
-+ * $Id$
++ * $Id: diskonchip.c,v 1.49 2005/02/22 21:48:21 gleixner Exp $
+ */
+
+#include <linux/kernel.h>
@@ -58184,8 +58184,8 @@
* Derived from drivers/mtd/nand/autcpu12.c
* Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
*
-- * $Id$
-+ * $Id$
+- * $Id: edb7312.c,v 1.3 2002/06/06 12:58:16 mag Exp $
++ * $Id: edb7312.c,v 1.11 2004/11/04 12:53:10 gleixner Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -58355,7 +58355,7 @@
+ * Copyright (C) 2002 Marius Gröger (mag@sysgo.de)
+ * Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
+ *
-+ * $Id$
++ * $Id: h1910.c,v 1.5 2004/11/04 12:53:10 gleixner Exp $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
@@ -58618,7 +58618,7 @@
+ * The AG-AND chips have nice features for speed improvement,
+ * which are not supported yet. Read / program 4 pages in one go.
+ *
-+ * $Id$
++ * $Id: nand_base.c,v 1.135 2005/03/01 09:32:45 gleixner Exp $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
@@ -61259,7 +61259,7 @@
+ *
+ * Copyright (C) 2004 Thomas Gleixner (tglx@linutronix.de)
+ *
-+ * $Id$
++ * $Id: nand_bbt.c,v 1.31 2005/02/16 17:09:36 dedekind Exp $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
@@ -62346,8 +62346,8 @@
+ * Copyright (C) 2000-2004 Steven J. Hill (sjhill@realitydiluted.com)
* Toshiba America Electronics Components, Inc.
*
-- * $Id$
-+ * $Id$
+- * $Id: nand_ecc.c,v 1.8 2002/09/16 09:19:53 dwmw2 Exp $
++ * $Id: nand_ecc.c,v 1.14 2004/06/16 15:34:37 gleixner Exp $
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
@@ -62454,8 +62454,8 @@
* Copyright (C) 2002 Thomas Gleixner (tglx@linutronix.de)
*
- *
-- * $Id$
-+ * $Id$
+- * $Id: nand_ids.c,v 1.1 2002/12/02 22:06:04 gleixner Exp $
++ * $Id: nand_ids.c,v 1.12 2005/02/16 09:33:27 gleixner Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -62613,7 +62613,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+ *
-+ * $Id$
++ * $Id: nandsim.c,v 1.7 2004/12/06 11:53:06 dedekind Exp $
+ */
+
+#include <linux/config.h>
@@ -64213,7 +64213,7 @@
+ * Derived from drivers/mtd/nand/edb7312.c
+ *
+ *
-+ * $Id$
++ * $Id: ppchameleonevb.c,v 1.6 2004/11/05 16:07:16 kalev Exp $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
@@ -64636,7 +64636,7 @@
+ * Derived from drivers/mtd/nand/spia.c
+ * Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
+ *
-+ * $Id$
++ * $Id: rtc_from4.c,v 1.9 2005/01/24 20:40:11 dmarlin Exp $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
@@ -65329,7 +65329,7 @@
+ * 12-Oct-2004 BJD Fixed errors in use of platform data
+ * 18-Feb-2004 BJD Fix sparse errors
+ *
-+ * $Id$
++ * $Id: s3c2410.c,v 1.8 2005/02/18 14:46:12 bjd Exp $
+ *
+ * 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
@@ -66028,7 +66028,7 @@
+ *
+ * Copyright (C) 2004 Richard Purdie
+ *
-+ * $Id$
++ * $Id: sharpsl.c,v 1.4 2005/01/23 11:09:19 rpurdie Exp $
+ *
+ * Based on Sharp's NAND driver sharp_sl.c
+ *
@@ -66297,8 +66297,8 @@
* to controllines (due to change in nand.c)
* page_cache added
*
-- * $Id$
-+ * $Id$
+- * $Id: spia.c,v 1.16 2002/03/05 13:50:47 dwmw2 Exp $
++ * $Id: spia.c,v 1.24 2004/11/04 12:53:10 gleixner Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -66465,7 +66465,7 @@
+ * This is a device driver for the NAND flash device found on the
+ * TI fido board. It supports 32MiB and 64MiB cards
+ *
-+ * $Id$
++ * $Id: toto.c,v 1.4 2004/10/05 13:50:20 gleixner Exp $
+ */
+
+#include <linux/slab.h>
@@ -66669,7 +66669,7 @@
+ * Derived from drivers/mtd/autcpu12.c
+ * Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
+ *
-+ * $Id$
++ * $Id: tx4925ndfmc.c,v 1.5 2004/10/05 13:50:20 gleixner Exp $
+ *
+ * Copyright (C) 2001 Toshiba Corporation
+ *
@@ -67087,7 +67087,7 @@
+ *
+ * Based on spia.c by Steven J. Hill
+ *
-+ * $Id$
++ * $Id: tx4938ndfmc.c,v 1.4 2004/10/05 13:50:20 gleixner Exp $
+ *
+ * Copyright (C) 2000-2001 Toshiba Corporation
+ *
@@ -67487,8 +67487,8 @@
/* Linux driver for NAND Flash Translation Layer */
/* (c) 1999 Machine Vision Holdings, Inc. */
/* Author: David Woodhouse <dwmw2@infradead.org> */
--/* $Id$ */
-+/* $Id$ */
+-/* $Id: nftlcore.c,v 1.87 2002/09/13 14:35:33 dwmw2 Exp $ */
++/* $Id: nftlcore.c,v 1.97 2004/11/16 18:28:59 dwmw2 Exp $ */
/*
The contents of this file are distributed under the GNU General
@@ -68230,7 +68230,7 @@
- int i;
-
-#ifdef PRERELEASE
-- printk(KERN_INFO "NFTL driver: nftlcore.c $Revision$, nftlmount.c %s\n", nftlmountrev);
+- printk(KERN_INFO "NFTL driver: nftlcore.c $Revision: 1.87 $, nftlmount.c %s\n", nftlmountrev);
-#endif
-
- if (register_blkdev(MAJOR_NR, "nftl", &nftl_fops)){
@@ -68249,7 +68249,7 @@
- }
-
- register_mtd_user(&nftl_notifier);
-+ printk(KERN_INFO "NFTL driver: nftlcore.c $Revision$, nftlmount.c %s\n", nftlmountrev);
++ printk(KERN_INFO "NFTL driver: nftlcore.c $Revision: 1.97 $, nftlmount.c %s\n", nftlmountrev);
- return 0;
+ return register_mtd_blktrans(&nftl_tr);
@@ -68273,8 +68273,8 @@
* Author: Fabrice Bellard (fabrice.bellard@netgem.com)
* Copyright (C) 2000 Netgem S.A.
*
-- * $Id$
-+ * $Id$
+- * $Id: nftlmount.c,v 1.31 2002/11/15 16:34:43 dwmw2 Exp $
++ * $Id: nftlmount.c,v 1.40 2004/11/22 14:38:29 kalev Exp $
*
* 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
@@ -68301,8 +68301,8 @@
#define SECTORSIZE 512
--char nftlmountrev[]="$Revision$";
-+char nftlmountrev[]="$Revision$";
+-char nftlmountrev[]="$Revision: 1.31 $";
++char nftlmountrev[]="$Revision: 1.40 $";
/* find_boot_record: Find the NFTL Media Header and its Spare copy which contains the
* various device information of the NFTL partition and Bad Unit Table. Update
@@ -68647,8 +68647,8 @@
+++ linux-2.4.21/drivers/mtd/redboot.c
@@ -1,5 +1,5 @@
/*
-- * $Id$
-+ * $Id$
+- * $Id: redboot.c,v 1.6 2001/10/25 09:16:06 dwmw2 Exp $
++ * $Id: redboot.c,v 1.17 2004/11/22 11:33:56 ijc Exp $
*
* Parse RedBoot-style Flash Image System (FIS) tables and
* produce a Linux partition array to match.
@@ -76854,7 +76854,7 @@
#
-# Makefile for the linux Journalling Flash FileSystem (JFFS) routines.
-#
--# $Id$
+-# $Id: Makefile,v 1.25.2.1 2002/10/11 09:04:44 dwmw2 Exp $
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
@@ -76862,7 +76862,7 @@
+# fs/jffs2/Makefile.24
#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-+# $Id$
++# $Id: Makefile,v 1.43 2003/10/06 12:54:49 dwmw2 Exp $
+ifdef OUT_OF_TREE_BUILD
+include $(mtd)/defconfig
@@ -76915,7 +76915,7 @@
+#
+# Makefile for the Linux Journalling Flash File System v2 (JFFS2)
+#
-+# $Id$
++# $Id: Makefile.common,v 1.9 2005/02/09 09:23:53 pavlov Exp $
+#
+
+obj-$(CONFIG_JFFS2_FS) += jffs2.o
@@ -76968,8 +76968,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: background.c,v 1.16 2001/10/08 09:22:38 dwmw2 Exp $
++ * $Id: background.c,v 1.50 2004/11/16 20:36:10 dwmw2 Exp $
*
*/
@@ -77168,8 +77168,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: build.c,v 1.16.2.3 2003/04/30 09:43:32 dwmw2 Exp $
++ * $Id: build.c,v 1.70 2005/02/28 08:21:05 dedekind Exp $
*
*/
@@ -77691,8 +77691,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: compr.c,v 1.17 2001/09/23 09:56:46 dwmw2 Exp $
++ * $Id: compr.c,v 1.43 2005/01/12 22:34:35 gleixner Exp $
*
*/
@@ -78242,7 +78242,7 @@
+ * For licensing information, see the file 'LICENCE' in the
+ * jffs2 directory.
+ *
-+ * $Id$
++ * $Id: compr.h,v 1.6 2004/07/16 15:17:57 dwmw2 Exp $
+ *
+ */
+
@@ -78363,7 +78363,7 @@
+ * For licensing information, see the file 'LICENCE' in the
+ * jffs2 directory.
+ *
-+ * $Id$
++ * $Id: compr_lzari.c,v 1.3 2004/06/23 16:34:39 havasi Exp $
+ *
+ */
+
@@ -79083,7 +79083,7 @@
+ * For licensing information, see the file 'LICENCE' in the
+ * jffs2 directory.
+ *
-+ * $Id$
++ * $Id: compr_lzo.c,v 1.3 2004/06/23 16:34:39 havasi Exp $
+ *
+ */
+
@@ -81441,8 +81441,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: compr_rtime.c,v 1.5 2001/03/15 15:38:23 dwmw2 Exp $
++ * $Id: compr_rtime.c,v 1.14 2004/06/23 16:34:40 havasi Exp $
*
*
* Very simple lz77-ish encoder.
@@ -81552,8 +81552,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: compr_rubin.c,v 1.13 2001/09/23 10:06:05 rmk Exp $
++ * $Id: compr_rubin.c,v 1.20 2004/06/23 16:34:40 havasi Exp $
*
*/
@@ -81734,8 +81734,8 @@
/* Rubin encoder/decoder header */
/* work started at : aug 3, 1994 */
/* last modification : aug 15, 1994 */
--/* $Id$ */
-+/* $Id$ */
+-/* $Id: compr_rubin.h,v 1.5 2001/02/26 13:50:01 dwmw2 Exp $ */
++/* $Id: compr_rubin.h,v 1.6 2002/01/25 01:49:26 dwmw2 Exp $ */
#include "pushpull.h"
@@ -81789,8 +81789,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: compr_zlib.c,v 1.8.2.1 2002/10/11 09:04:44 dwmw2 Exp $
++ * $Id: compr_zlib.c,v 1.29 2004/11/16 20:36:11 dwmw2 Exp $
*
*/
@@ -82058,8 +82058,8 @@
* polynomial $edb88320
*/
--/* $Id$ */
-+/* $Id$ */
+-/* $Id: crc32.c,v 1.3 2001/02/07 16:45:32 dwmw2 Exp $ */
++/* $Id: crc32.c,v 1.4 2002/01/03 15:20:44 dwmw2 Exp $ */
#include "crc32.h"
@@ -82074,8 +82074,8 @@
#ifndef CRC32_H
#define CRC32_H
--/* $Id$ */
-+/* $Id$ */
+-/* $Id: crc32.h,v 1.3 2001/02/26 14:44:37 dwmw2 Exp $ */
++/* $Id: crc32.h,v 1.4 2002/01/03 15:20:44 dwmw2 Exp $ */
#include <linux/types.h>
@@ -82130,8 +82130,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: dir.c,v 1.45.2.7 2002/08/26 15:30:18 dwmw2 Exp $
++ * $Id: dir.c,v 1.85 2005/03/01 10:34:03 dedekind Exp $
*
*/
@@ -83105,8 +83105,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: erase.c,v 1.24 2001/12/06 16:38:38 dwmw2 Exp $
++ * $Id: erase.c,v 1.72 2005/02/27 23:01:32 dwmw2 Exp $
*
*/
+
@@ -83619,8 +83619,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: file.c,v 1.58.2.6 2002/11/12 13:17:01 dwmw2 Exp $
++ * $Id: file.c,v 1.99 2004/11/16 20:36:11 dwmw2 Exp $
*
*/
@@ -84216,7 +84216,7 @@
+ *
+ * For licensing information, see the file 'LICENCE' in this directory.
+ *
-+ * $Id$
++ * $Id: fs.c,v 1.53 2005/02/09 09:23:53 pavlov Exp $
+ *
+ */
+
@@ -84939,8 +84939,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: gc.c,v 1.52.2.5 2002/10/10 13:18:38 dwmw2 Exp $
++ * $Id: gc.c,v 1.145 2005/02/09 09:09:01 pavlov Exp $
*
*/
@@ -86394,8 +86394,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: ioctl.c,v 1.5 2001/03/15 15:38:24 dwmw2 Exp $
++ * $Id: ioctl.c,v 1.9 2004/11/16 20:36:11 dwmw2 Exp $
*
*/
@@ -86446,8 +86446,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: malloc.c,v 1.16 2001/03/15 15:38:24 dwmw2 Exp $
++ * $Id: malloc.c,v 1.28 2004/11/16 20:36:11 dwmw2 Exp $
*
*/
@@ -86688,8 +86688,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: nodelist.c,v 1.30.2.6 2003/02/24 21:49:33 dwmw2 Exp $
++ * $Id: nodelist.c,v 1.93 2005/02/27 23:01:32 dwmw2 Exp $
*
*/
@@ -87383,8 +87383,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: nodelist.h,v 1.46.2.4 2003/02/24 21:49:33 dwmw2 Exp $
++ * $Id: nodelist.h,v 1.128 2005/02/27 23:01:32 dwmw2 Exp $
*
*/
@@ -87979,8 +87979,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: nodemgmt.c,v 1.45.2.1 2002/02/23 14:13:34 dwmw2 Exp $
++ * $Id: nodemgmt.c,v 1.119 2005/02/28 08:21:05 dedekind Exp $
*
*/
@@ -88907,7 +88907,7 @@
+ *
+ * For licensing information, see the file 'LICENCE' in this directory.
+ *
-+ * $Id$
++ * $Id: os-linux.h,v 1.54 2005/02/09 09:23:53 pavlov Exp $
+ *
+ */
+
@@ -89164,8 +89164,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: pushpull.h,v 1.5 2001/09/23 10:04:15 rmk Exp $
++ * $Id: pushpull.h,v 1.10 2004/11/16 20:36:11 dwmw2 Exp $
*
*/
@@ -89239,7 +89239,7 @@
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
-+ $Id$
++ $Id: rbtree.c,v 1.3 2003/10/16 08:02:19 dwmw2 Exp $
+*/
+
+#ifdef __ECOS /* This file is _not_ under the eCos licence; it is pure GPL. */
@@ -89622,8 +89622,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: read.c,v 1.13.2.1 2002/02/01 23:32:33 dwmw2 Exp $
++ * $Id: read.c,v 1.39 2005/03/01 10:34:03 dedekind Exp $
*
*/
@@ -89877,8 +89877,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: readinode.c,v 1.58.2.6 2002/10/10 13:18:38 dwmw2 Exp $
++ * $Id: readinode.c,v 1.119 2005/03/01 10:34:03 dedekind Exp $
*
*/
@@ -90924,8 +90924,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: scan.c,v 1.51.2.3 2002/07/25 20:49:06 dwmw2 Exp $
++ * $Id: scan.c,v 1.119 2005/02/17 17:51:13 dedekind Exp $
*
*/
#include <linux/kernel.h>
@@ -92194,7 +92194,7 @@
+ *
+ * For licensing information, see the file 'LICENCE' in this directory.
+ *
-+ * $Id$
++ * $Id: super-v24.c,v 1.83 2005/02/09 09:23:54 pavlov Exp $
+ *
+ */
+
@@ -92394,8 +92394,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: super.c,v 1.48.2.3 2002/10/11 09:04:44 dwmw2 Exp $
++ * $Id: super.c,v 1.105 2005/02/09 09:23:54 pavlov Exp $
*
*/
@@ -93002,7 +93002,7 @@
+ *
+ * For licensing information, see the file 'LICENCE' in this directory.
+ *
-+ * $Id$
++ * $Id: symlink-v24.c,v 1.17 2005/03/04 13:12:25 dedekind Exp $
+ *
+ */
+
@@ -93081,8 +93081,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: symlink.c,v 1.5.2.1 2002/01/15 10:39:06 dwmw2 Exp $
++ * $Id: symlink.c,v 1.16 2005/03/01 10:50:48 dedekind Exp $
*
*/
@@ -93203,7 +93203,7 @@
+ *
+ * For licensing information, see the file 'LICENCE' in this directory.
+ *
-+ * $Id$
++ * $Id: wbuf.c,v 1.89 2005/02/09 09:23:54 pavlov Exp $
+ *
+ */
+
@@ -94471,8 +94471,8 @@
- * under either the RHEPL or the GPL.
+ * For licensing information, see the file 'LICENCE' in this directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: write.c,v 1.30.2.1 2002/08/08 08:36:31 dwmw2 Exp $
++ * $Id: write.c,v 1.91 2005/03/01 10:34:03 dedekind Exp $
*
*/
@@ -95321,7 +95321,7 @@
+ *
+ * For licensing information, see the file 'LICENCE' in this directory.
+ *
-+ * $Id$
++ * $Id: writev.c,v 1.6 2004/11/16 20:36:12 dwmw2 Exp $
+ *
+ */
+
@@ -96124,7 +96124,7 @@
+#ifndef CRC32_H
+#define CRC32_H
+
-+/* $Id$ */
++/* $Id: crc32.h,v 1.4 2002/01/03 15:20:44 dwmw2 Exp $ */
+
+#include <linux/types.h>
+
@@ -96249,8 +96249,8 @@
+ * For licensing information, see the file 'LICENCE' in the
+ * jffs2 directory.
*
-- * $Id$
-+ * $Id$
+- * $Id: jffs2.h,v 1.19 2001/10/09 13:20:23 dwmw2 Exp $
++ * $Id: jffs2.h,v 1.34 2004/11/16 20:36:14 dwmw2 Exp $
*
*/
@@ -96418,8 +96418,8 @@
--- linux-2.4.21/include/linux/jffs2_fs_i.h~mtd-cvs
+++ linux-2.4.21/include/linux/jffs2_fs_i.h
@@ -1,22 +1,13 @@
--/* $Id$ */
-+/* $Id$ */
+-/* $Id: jffs2_fs_i.h,v 1.8 2001/04/18 13:05:28 dwmw2 Exp $ */
++/* $Id: jffs2_fs_i.h,v 1.17 2004/11/11 23:51:27 dwmw2 Exp $ */
#ifndef _JFFS2_FS_I
#define _JFFS2_FS_I
@@ -96487,8 +96487,8 @@
--- linux-2.4.21/include/linux/jffs2_fs_sb.h~mtd-cvs
+++ linux-2.4.21/include/linux/jffs2_fs_sb.h
@@ -1,18 +1,23 @@
--/* $Id$ */
-+/* $Id$ */
+-/* $Id: jffs2_fs_sb.h,v 1.16.2.1 2002/02/23 14:13:34 dwmw2 Exp $ */
++/* $Id: jffs2_fs_sb.h,v 1.51 2005/02/28 08:21:06 dedekind Exp $ */
#ifndef _JFFS2_FS_SB
#define _JFFS2_FS_SB
@@ -96640,7 +96640,7 @@
+++ linux-2.4.21/include/linux/mtd/blktrans.h
@@ -0,0 +1,72 @@
+/*
-+ * $Id$
++ * $Id: blktrans.h,v 1.5 2003/06/23 12:00:08 dwmw2 Exp $
+ *
+ * (C) 2003 David Woodhouse <dwmw2@infradead.org>
+ *
@@ -96717,8 +96717,8 @@
/* Common Flash Interface structures
* See http://support.intel.com/design/flash/technote/index.htm
-- * $Id$
-+ * $Id$
+- * $Id: cfi.h,v 1.32 2002/09/05 05:15:32 acurtis Exp $
++ * $Id: cfi.h,v 1.52 2005/02/08 17:11:15 nico Exp $
*/
#ifndef __MTD_CFI_H__
@@ -97431,8 +97431,8 @@
/*
- * mtd/include/compatmac.h
- *
-- * $Id$
-+ * $Id$
+- * $Id: compatmac.h,v 1.45 2003/01/24 15:50:57 dwmw2 Exp $
++ * $Id: compatmac.h,v 1.71 2005/01/12 23:01:17 dmarlin Exp $
*
* Extensions and omissions from the normal 'linux/compatmac.h'
* files. hopefully this will end up empty as the 'real' one
@@ -98155,7 +98155,7 @@
-/* Linux driver for Disk-On-Chip 2000 */
-/* (c) 1999 Machine Vision Holdings, Inc. */
-/* Author: David Woodhouse <dwmw2@mvhi.com> */
--/* $Id$ */
+-/* $Id: doc2000.h,v 1.15 2001/09/19 00:22:15 dwmw2 Exp $ */
+/*
+ * Linux driver for Disk-On-Chip devices
+ *
@@ -98164,7 +98164,7 @@
+ * Copyright (C) 2002-2003 Greg Ungerer <gerg@snapgear.com>
+ * Copyright (C) 2002-2003 SnapGear Inc
+ *
-+ * $Id$
++ * $Id: doc2000.h,v 1.24 2005/01/05 12:40:38 dwmw2 Exp $
+ *
+ * Released under GPL
+ */
@@ -98308,8 +98308,8 @@
*
* (C) 2000 Red Hat. GPLd.
*
-- * $Id$
-+ * $Id$
+- * $Id: flashchip.h,v 1.8 2002/10/21 13:20:52 jocke Exp $
++ * $Id: flashchip.h,v 1.16 2005/02/08 17:11:15 nico Exp $
*
*/
@@ -98375,8 +98375,8 @@
/*
* (C) 2001, 2001 Red Hat, Inc.
* GPL'd
-- * $Id$
-+ * $Id$
+- * $Id: gen_probe.h,v 1.1 2001/09/02 18:50:13 dwmw2 Exp $
++ * $Id: gen_probe.h,v 1.3 2004/10/20 22:10:33 dwmw2 Exp $
*/
#ifndef __LINUX_MTD_GEN_PROBE_H__
@@ -98403,7 +98403,7 @@
+ *
+ * (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
+ *
-+ * $Id$
++ * $Id: inftl.h,v 1.6 2004/06/30 14:49:00 dbrown Exp $
+ */
+
+#ifndef __MTD_INFTL_H__
@@ -98461,8 +98461,8 @@
*
* See the AMD flash databook for information on how to operate the interface.
*
-- * $Id$
-+ * $Id$
+- * $Id: jedec.h,v 1.2 2001/11/06 14:37:36 dwmw2 Exp $
++ * $Id: jedec.h,v 1.3 2003/05/21 11:51:01 dwmw2 Exp $
*/
#ifndef __LINUX_MTD_JEDEC_H__
@@ -98478,8 +98478,8 @@
@@ -1,23 +1,176 @@
/* Overhauled routines for dealing with different mmap regions of flash */
--/* $Id$ */
-+/* $Id$ */
+-/* $Id: map.h,v 1.29 2002/10/21 13:20:52 jocke Exp $ */
++/* $Id: map.h,v 1.48 2005/02/16 15:54:59 nico Exp $ */
#ifndef __LINUX_MTD_MAP_H__
#define __LINUX_MTD_MAP_H__
@@ -98939,9 +98939,9 @@
+++ linux-2.4.21/include/linux/mtd/mtd.h
@@ -1,123 +1,45 @@
-
--/* $Id$ */
+-/* $Id: mtd.h,v 1.38 2003/01/12 16:30:19 spse Exp $ */
+/*
-+ * $Id$
++ * $Id: mtd.h,v 1.57 2005/02/08 17:11:15 nico Exp $
+ *
+ * Copyright (C) 1999-2003 David Woodhouse <dwmw2@infradead.org> et al.
+ *
@@ -99264,8 +99264,8 @@
+ * Steven J. Hill <sjhill@realitydiluted.com>
* Thomas Gleixner <tglx@linutronix.de>
*
-- * $Id$
-+ * $Id$
+- * $Id: nand.h,v 1.19 2002/12/02 21:48:17 gleixner Exp $
++ * $Id: nand.h,v 1.71 2005/02/09 12:12:59 gleixner Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -99862,8 +99862,8 @@
- * Copyright (C) 2000 Steven J. Hill (sjhill@cotw.com)
+ * Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
*
-- * $Id$
-+ * $Id$
+- * $Id: nand_ecc.h,v 1.1 2000/10/12 00:57:15 sjhill Exp $
++ * $Id: nand_ecc.h,v 1.4 2004/06/17 02:35:02 dbrown Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -99900,9 +99900,9 @@
-/* Defines for NAND Flash Translation Layer */
-/* (c) 1999 Machine Vision Holdings, Inc. */
-/* Author: David Woodhouse <dwmw2@mvhi.com> */
--/* $Id$ */
+-/* $Id: nftl.h,v 1.11 2002/06/18 13:54:24 dwmw2 Exp $ */
+/*
-+ * $Id$
++ * $Id: nftl.h,v 1.16 2004/06/30 14:49:00 dbrown Exp $
+ *
+ * (C) 1999-2003 David Woodhouse <dwmw2@infradead.org>
+ */
@@ -100026,8 +100026,8 @@
*
* This code is GPL
*
-- * $Id$
-+ * $Id$
+- * $Id: partitions.h,v 1.8 2002/03/08 16:34:36 rkaiser Exp $
++ * $Id: partitions.h,v 1.16 2004/11/16 18:34:40 dwmw2 Exp $
*/
#ifndef MTD_PARTITIONS_H
@@ -100074,7 +100074,7 @@
+ * For boards with physically mapped flash and using
+ * drivers/mtd/maps/physmap.c mapping driver.
+ *
-+ * $Id$
++ * $Id: physmap.h,v 1.3 2004/07/21 00:16:15 jwboyer Exp $
+ *
+ * Copyright (C) 2003 MontaVista Software Inc.
+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
@@ -100142,7 +100142,7 @@
+ *
+ * Generic platform device based RAM map
+ *
-+ * $Id$
++ * $Id: plat-ram.h,v 1.2 2005/01/24 00:37:40 bjd Exp $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
@@ -100186,7 +100186,7 @@
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
-+ * $Id$
++ * $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $
+ */
+
+#ifndef __LINUX_MTD_XIP_H__
@@ -100613,7 +100613,7 @@
-}
-rb_node_t;
+ * 2.5 compatibility
-+ * $Id$
++ * $Id: rbtree.h,v 1.3 2003/01/14 13:56:05 dwmw2 Exp $
+ */
-typedef struct rb_root_s
@@ -100668,7 +100668,7 @@
+ * RS code lifted from reed solomon library written by Phil Karn
+ * Copyright 2002 Phil Karn, KA9Q
+ *
-+ * $Id$
++ * $Id: rslib.h,v 1.3 2004/10/05 22:08:22 gleixner Exp $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
@@ -100791,7 +100791,7 @@
--- /dev/null
+++ linux-2.4.21/include/linux/suspend.h
@@ -0,0 +1,10 @@
-+/* $Id$ */
++/* $Id: suspend.h,v 1.1 2003/10/13 20:56:47 dwmw2 Exp $ */
+
+#ifndef __MTD_COMPAT_VERSION_H__
+#include <linux/version.h>
@@ -101114,7 +101114,7 @@
@@ -0,0 +1,21 @@
+/*
+ * 2.5 compatibility
-+ * $Id$
++ * $Id: workqueue.h,v 1.1 2002/11/11 16:39:10 dwmw2 Exp $
+ */
+
+#ifndef __MTD_COMPAT_WORKQUEUE_H__
@@ -101137,7 +101137,7 @@
+++ linux-2.4.21/include/mtd/inftl-user.h
@@ -0,0 +1,91 @@
+/*
-+ * $Id$
++ * $Id: inftl-user.h,v 1.1 2004/05/05 15:17:00 dwmw2 Exp $
+ *
+ * Parts of INFTL headers shared with userspace
+ *
@@ -101231,7 +101231,7 @@
+++ linux-2.4.21/include/mtd/jffs2-user.h
@@ -0,0 +1,35 @@
+/*
-+ * $Id$
++ * $Id: jffs2-user.h,v 1.1 2004/05/05 11:57:54 dwmw2 Exp $
+ *
+ * JFFS2 definitions for use in user space only
+ */
@@ -101269,7 +101269,7 @@
+++ linux-2.4.21/include/mtd/mtd-abi.h
@@ -0,0 +1,119 @@
+/*
-+ * $Id$
++ * $Id: mtd-abi.h,v 1.10 2005/02/09 09:17:42 pavlov Exp $
+ *
+ * Portions of MTD ABI definition which are shared by kernel and user space
+ */
@@ -101391,7 +101391,7 @@
+++ linux-2.4.21/include/mtd/mtd-user.h
@@ -0,0 +1,20 @@
+/*
-+ * $Id$
++ * $Id: mtd-user.h,v 1.2 2004/05/05 14:44:57 dwmw2 Exp $
+ *
+ * MTD ABI header for use by user space only.
+ */
@@ -101414,7 +101414,7 @@
+++ linux-2.4.21/include/mtd/nftl-user.h
@@ -0,0 +1,76 @@
+/*
-+ * $Id$
++ * $Id: nftl-user.h,v 1.1 2004/05/05 14:44:57 dwmw2 Exp $
+ *
+ * Parts of NFTL headers shared with userspace
+ *
@@ -102535,7 +102535,7 @@
+ *
+ * Adaption to the kernel by Thomas Gleixner (tglx@linutronix.de)
+ *
-+ * $Id$
++ * $Id: decode_rs.c,v 1.6 2004/10/22 15:41:47 gleixner Exp $
+ *
+ */
+
@@ -102810,7 +102810,7 @@
+ *
+ * Adaption to the kernel by Thomas Gleixner (tglx@linutronix.de)
+ *
-+ * $Id$
++ * $Id: encode_rs.c,v 1.4 2004/10/22 15:41:47 gleixner Exp $
+ *
+ */
+
@@ -102867,7 +102867,7 @@
+ * Reed Solomon code lifted from reed solomon library written by Phil Karn
+ * Copyright 2002 Phil Karn, KA9Q
+ *
-+ * $Id$
++ * $Id: rslib.c,v 1.5 2004/10/22 15:41:47 gleixner Exp $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
@@ -103264,7 +103264,7 @@
+++ linux-2.4.21/net/bluetooth/af_bluetooth.c
@@ -27,7 +27,7 @@
*
- * $Id$
+ * $Id: af_bluetooth.c,v 1.8 2002/07/22 20:32:54 maxk Exp $
*/
-#define VERSION "2.2"
+#define VERSION "2.4"
@@ -106458,7 +106458,7 @@
+++ linux-2.4.21/net/bluetooth/l2cap.c
@@ -27,7 +27,7 @@
*
- * $Id$
+ * $Id: l2cap.c,v 1.15 2002/09/09 01:14:52 maxk Exp $
*/
-#define VERSION "2.1"
+#define VERSION "2.3"