From 35e7dcd3faecb7d8e5e58c468ce7178f770137b6 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Thu, 30 Jun 2005 02:58:47 -0700 Subject: [PATCH] --- yaml --- r: 3991 b: refs/heads/master c: eb05bfe4fbf031f95e392204efaa4da71c75b2e2 h: refs/heads/master i: 3989: 120925aa6f9b10c78cb8afc3d591b9f597f11868 3987: 2a26462d1a05b71544694f2e2c9b4df9a9584901 3983: 71b465ba54a0bd3c96c6e7c3ff5137bff344f061 v: v3 --- [refs] | 2 +- trunk/Documentation/Changes | 2 +- trunk/Documentation/pcmcia/devicetable.txt | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a1caa7c7e63c..0fc269c913e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3704511b2ee8b01475ca7c171d62c682342fa38e +refs/heads/master: eb05bfe4fbf031f95e392204efaa4da71c75b2e2 diff --git a/trunk/Documentation/Changes b/trunk/Documentation/Changes index afebdbcd553a..dfec7569d450 100644 --- a/trunk/Documentation/Changes +++ b/trunk/Documentation/Changes @@ -57,7 +57,7 @@ o e2fsprogs 1.29 # tune2fs o jfsutils 1.1.3 # fsck.jfs -V o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1|grep reiserfsprogs o xfsprogs 2.6.0 # xfs_db -V -o pcmciautils 001 +o pcmciautils 004 o pcmcia-cs 3.1.21 # cardmgr -V o quota-tools 3.09 # quota -V o PPP 2.4.0 # pppd --version diff --git a/trunk/Documentation/pcmcia/devicetable.txt b/trunk/Documentation/pcmcia/devicetable.txt index 045511acafc9..3351c0355143 100644 --- a/trunk/Documentation/pcmcia/devicetable.txt +++ b/trunk/Documentation/pcmcia/devicetable.txt @@ -19,9 +19,8 @@ PCMCIA_DEVICE_PROD_ID1("some_string", 0x(hash_of_some_string)), If the hash is incorrect, the kernel will inform you about this in "dmesg" upon module initialization, and tell you of the correct hash. -You can determine the hash of the product ID strings by running -"pcmcia-modalias %n.%m" [%n being replaced with the socket number and %m being -replaced with the device function] from pcmciautils. It generates a string +You can determine the hash of the product ID strings by catting the file +"modalias" in the sysfs directory of the PCMCIA device. It generates a string in the following form: pcmcia:m0149cC1ABf06pfn00fn00pa725B842DpbF1EFEE84pc0877B627pd00000000