diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
| commit | e993835441734c184d70d3716eed78a08eeb71c2 (patch) | |
| tree | 583aa17813cdae1c4640e353f8c6df3f197e7548 /drivers/mmc/mmc.c | |
| parent | 360f654e7cda850034f3f6252a7a7cff3fa77356 (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/mmc/mmc.c')
| -rw-r--r-- | drivers/mmc/mmc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 74eaaee66de0..5b9caa7978d3 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c | |||
| @@ -996,7 +996,6 @@ static void mmc_read_scrs(struct mmc_host *host) | |||
| 996 | 996 | ||
| 997 | mmc_set_data_timeout(&data, card, 0); | 997 | mmc_set_data_timeout(&data, card, 0); |
| 998 | 998 | ||
| 999 | data.blksz_bits = 3; | ||
| 1000 | data.blksz = 1 << 3; | 999 | data.blksz = 1 << 3; |
| 1001 | data.blocks = 1; | 1000 | data.blocks = 1; |
| 1002 | data.flags = MMC_DATA_READ; | 1001 | data.flags = MMC_DATA_READ; |