diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
| commit | 97148ba2235e334e57d05fa07045cf3e6629763c (patch) | |
| tree | a04504e7d4feb0dacfe1862a59abecaf99997f09 /include/linux/mmc/host.h | |
| parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
| parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) | |
Merge branch 'master' into upstream
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; |