aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-07-04 09:14:42 -0400
committerAnton Altaparmakov <aia21@cantab.net>2005-07-04 09:14:42 -0400
commit07929dcb963786512c760dd3ecd148d89295e7e5 (patch)
treef5db01392ebb968b4c8acb5a6b3b03a833bfcb02 /Documentation
parentc2d9b8387bce8b4a0fd402fab7dc1319d11a418d (diff)
parent19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff)
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Changes2
-rw-r--r--Documentation/pcmcia/devicetable.txt5
2 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/Changes b/Documentation/Changes
index afebdbcd553..dfec7569d45 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -57,7 +57,7 @@ o e2fsprogs 1.29 # tune2fs
57o jfsutils 1.1.3 # fsck.jfs -V 57o jfsutils 1.1.3 # fsck.jfs -V
58o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1|grep reiserfsprogs 58o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1|grep reiserfsprogs
59o xfsprogs 2.6.0 # xfs_db -V 59o xfsprogs 2.6.0 # xfs_db -V
60o pcmciautils 001 60o pcmciautils 004
61o pcmcia-cs 3.1.21 # cardmgr -V 61o pcmcia-cs 3.1.21 # cardmgr -V
62o quota-tools 3.09 # quota -V 62o quota-tools 3.09 # quota -V
63o PPP 2.4.0 # pppd --version 63o PPP 2.4.0 # pppd --version
diff --git a/Documentation/pcmcia/devicetable.txt b/Documentation/pcmcia/devicetable.txt
index 045511acafc..3351c035514 100644
--- a/Documentation/pcmcia/devicetable.txt
+++ b/Documentation/pcmcia/devicetable.txt
@@ -19,9 +19,8 @@ PCMCIA_DEVICE_PROD_ID1("some_string", 0x(hash_of_some_string)),
19If the hash is incorrect, the kernel will inform you about this in "dmesg" 19If the hash is incorrect, the kernel will inform you about this in "dmesg"
20upon module initialization, and tell you of the correct hash. 20upon module initialization, and tell you of the correct hash.
21 21
22You can determine the hash of the product ID strings by running 22You can determine the hash of the product ID strings by catting the file
23"pcmcia-modalias %n.%m" [%n being replaced with the socket number and %m being 23"modalias" in the sysfs directory of the PCMCIA device. It generates a string
24replaced with the device function] from pcmciautils. It generates a string
25in the following form: 24in the following form:
26pcmcia:m0149cC1ABf06pfn00fn00pa725B842DpbF1EFEE84pc0877B627pd00000000 25pcmcia:m0149cC1ABf06pfn00fn00pa725B842DpbF1EFEE84pc0877B627pd00000000
27 26