diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:08:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:08:33 -0800 |
| commit | 8e9c238c3884c226f0cddc31cde87dd5df1a6500 (patch) | |
| tree | d6b4bb2f474580fd6f52e70447f8ed79d441a89d /drivers/mmc/mmc.c | |
| parent | f17578decc40df8fceff82b106582e30bdfb3189 (diff) | |
| parent | 7225b3fd0b6e224235fc50a69f70479ff96d5602 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc/mmc.c')
| -rw-r--r-- | drivers/mmc/mmc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 6696f71363b..bfca5c176e8 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -495,6 +495,7 @@ static void mmc_decode_cid(struct mmc_card *card) case 2: /* MMC v2.0 - v2.2 */ case 3: /* MMC v3.1 - v3.3 */ + case 4: /* MMC v4 */ card->cid.manfid = UNSTUFF_BITS(resp, 120, 8); card->cid.oemid = UNSTUFF_BITS(resp, 104, 16); card->cid.prod_name[0] = UNSTUFF_BITS(resp, 96, 8); |