diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-06-30 02:58:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 08:45:08 -0700 |
| commit | eb05bfe4fbf031f95e392204efaa4da71c75b2e2 (patch) | |
| tree | 63ba97dcd72e48992fea12bf01587dd36eccb90a /Documentation | |
| parent | 3704511b2ee8b01475ca7c171d62c682342fa38e (diff) | |
| download | linux-3.10-eb05bfe4fbf031f95e392204efaa4da71c75b2e2.tar.gz linux-3.10-eb05bfe4fbf031f95e392204efaa4da71c75b2e2.tar.bz2 linux-3.10-eb05bfe4fbf031f95e392204efaa4da71c75b2e2.zip | |
[PATCH] pcmcia: update Documentation
As the information is now exported via sysfs, there's no need for an userspace
tool any longer.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/Changes | 2 | ||||
| -rw-r--r-- | Documentation/pcmcia/devicetable.txt | 5 |
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 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/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)), 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 |