Synced pci.ids with Linux 2.3.40 and released as pciutils-2.1.4.

diff --git a/ChangeLog b/ChangeLog
index 58f7c34485a330fe9be981b833035f68d77b7e5f..c615ab0bd6453eb4f60dd09e80f3dd1c3bbcad9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jan 23 10:52:34 2000  Martin Mares  <mj@albireo.ucw.cz>
+
+       * pci.ids: Synced with Linux 2.3.40.
+
+       * Released as version 2.1.4.
+
 Thu Jan 20 11:08:32 2000  Martin Mares  <mj@albireo.ucw.cz>
 
        * lspci.c (scan_device): Fixed bug in reading of cardbus extensions.

diff --git a/Makefile b/Makefile
index 00c3666fe27afbce443f8c5c7ae1f3a209eb89c8..8c1958e3706bb23298b23541c5d0e76360f6f2f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.28 2000/01/13 22:51:31 mj Exp $
+# $Id: Makefile,v 1.29 2000/01/23 05:57:04 mj Exp $
 # Makefile for Linux PCI Utilities
 # (c) 1998--1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
 
@@ -6,10 +6,10 @@ OPT=-O2 -fomit-frame-pointer
 #OPT=-O2 -g
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Werror
 
-VERSION=2.1.3
+VERSION=2.1.4
 SUFFIX=
 #SUFFIX=-alpha
-DATE=2000-01-13
+DATE=2000-01-23
 
 ifeq ($(shell uname),FreeBSD)
 ROOT=/usr/local

diff --git a/README b/README
index 4ead96a4091e312478f221beef165852d432bc62..248e70cf383fd932e27cfa5d140e8a5c39d97271 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This package contains the PCI Utilities, version 2.1.3.
+This package contains the PCI Utilities, version 2.1.4.
 
 Copyright (c) 1997--2000 Martin Mares <mj@suse.cz>
 

diff --git a/lspci.c b/lspci.c
index 77e0786891143a4eeea2b173193c60146bcccc06..656e445ec0a32816fce2744d75b2cd791cb73561 100644 (file)
--- a/lspci.c
+++ b/lspci.c
@@ -1,5 +1,5 @@
 /*
- *     $Id: lspci.c,v 1.34 2000/01/20 21:23:14 mj Exp $
+ *     $Id: lspci.c,v 1.35 2000/01/23 05:57:04 mj Exp $
  *
  *     Linux PCI Utilities -- List All PCI Devices
  *
@@ -399,7 +399,7 @@ format_agp_rate(int rate, char *buf)
        if (c != buf)
          *c++ = ',';
        *c++ = 'x';
-       *c++ = '0' + (4 >> i);
+       *c++ = '0' + (1 << i);
       }
   if (c != buf)
     *c = 0;

diff --git a/pci.ids b/pci.ids
index c50e9e153fe700642d75b355b0481eae74ad8102..cddf478797ffbbfcd86d71fa4edffbeca8d20bb2 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -4,7 +4,7 @@
 #      Maintained by Martin Mares <pci-ids@ucw.cz>
 #      If you have any new entries, send them to the maintainer.
 #
-#      $Id: pci.ids,v 1.49 2000/01/20 21:24:51 mj Exp $
+#      $Id: pci.ids,v 1.50 2000/01/23 05:57:06 mj Exp $
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -953,8 +953,9 @@
        0640  PCI0640
        0643  PCI0643
        0646  PCI0646
-       0650  PBC0650A
        0647  PCI0647
+       0648  PCI0648
+       0650  PBC0650A
        0670  USB0670
        0673  USB0673
 1096  Alacron

diff --git a/pciutils.lsm b/pciutils.lsm
index 49fdaaf47bf45d77a30a1a8aef23e6a5db5e471b..154f2084ca69b34b1f7ecaf51318d0c4e824c1f2 100644 (file)
--- a/pciutils.lsm
+++ b/pciutils.lsm
@@ -1,13 +1,13 @@
 Begin3
 Title:          Linux PCI Utilities
-Version:        2.1.3
+Version:        2.1.4
 Entered-date:   
 Description:    This package contains various utilities for inspecting and
                setting of devices connected to the PCI bus.
 Keywords:       kernel, pci, lspci, setpci, libpci
 Author:         mj@suse.cz (Martin Mares)
 Maintained-by:  mj@suse.cz (Martin Mares)
-Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.1.3.tar.gz
-Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.1.3.tar.gz
+Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.1.4.tar.gz
+Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.1.4.tar.gz
 Copying-policy: GPL
 End

diff --git a/pciutils.spec b/pciutils.spec
index 7df982ee9a76f15616b5a04982507c44e4d56524..0436f10bc8e435305b99fce6aa455a654a5b04ff 100644 (file)
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,5 +1,5 @@
 Name:          pciutils
-Version:       2.1.3
+Version:       2.1.4
 Release:       1
 Source:                ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Copyright:     GNU GPL