diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 10:56:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 10:56:38 -0400 |
| commit | e004876c3b0b6a71406069b0e55368cb9bbdc920 (patch) | |
| tree | 43f95e14b282cbc683ec66539de25e0e94649f65 /include/linux/mmc/host.h | |
| parent | 5a05e5bf204e729b79e9462785f2fa09d5126855 (diff) | |
| parent | 6fe9febb8af2f82f9caace1aa1c00cd8de7469ac (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc:
[MMC] Always use a sector size of 512 bytes
[MMC] Cleanup 385e3227d4d83ab13d7767c4bb3593b0256bf246
[ARM] 3751/1: i.MX/MX1 SD/MMC use 512 bytes request for SCR read
[MMC] Fix SD timeout calculation
[MMC] constify mmc_host_ops
Diffstat (limited to 'include/linux/mmc/host.h')
| -rw-r--r-- | include/linux/mmc/host.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index c1f021eddffa..ba095aebedff 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h | |||
| @@ -77,7 +77,7 @@ struct mmc_host { | |||
| 77 | struct device *dev; | 77 | struct device *dev; |
| 78 | struct class_device class_dev; | 78 | struct class_device class_dev; |
| 79 | int index; | 79 | int index; |
| 80 | struct mmc_host_ops *ops; | 80 | const struct mmc_host_ops *ops; |
| 81 | unsigned int f_min; | 81 | unsigned int f_min; |
| 82 | unsigned int f_max; | 82 | unsigned int f_max; |
| 83 | u32 ocr_avail; | 83 | u32 ocr_avail; |