diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 17:49:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 17:49:29 -0400 |
| commit | c9ab09710ecb071031b0a04f3f9d7e686c0a75e0 (patch) | |
| tree | 4c270fb2390392d44426ab7551f0fa0215e1def4 | |
| parent | ff9144530e9cfe8923e00172e3f8ff83c3b8ff8b (diff) | |
| parent | 12223dabc617a4babfba4e17feb1ed88e8cfeb8f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc:
[MMC] Add (MMC) to entry in MAINTAINERS file
[MMC] sdhci truncated pointer fix
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/mmc/sdhci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1421f74b6009..854a152e5e95 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1895,7 +1895,7 @@ L: linux-kernel@vger.kernel.org | |||
| 1895 | W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html | 1895 | W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html |
| 1896 | S: Maintained | 1896 | S: Maintained |
| 1897 | 1897 | ||
| 1898 | MULTIMEDIA CARD SUBSYSTEM | 1898 | MULTIMEDIA CARD (MMC) SUBSYSTEM |
| 1899 | P: Russell King | 1899 | P: Russell King |
| 1900 | M: rmk+mmc@arm.linux.org.uk | 1900 | M: rmk+mmc@arm.linux.org.uk |
| 1901 | S: Maintained | 1901 | S: Maintained |
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index b0053280ff2d..6bfcdbc7491e 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c | |||
| @@ -1073,7 +1073,7 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot) | |||
| 1073 | tasklet_init(&host->finish_tasklet, | 1073 | tasklet_init(&host->finish_tasklet, |
| 1074 | sdhci_tasklet_finish, (unsigned long)host); | 1074 | sdhci_tasklet_finish, (unsigned long)host); |
| 1075 | 1075 | ||
| 1076 | setup_timer(&host->timer, sdhci_timeout_timer, (int)host); | 1076 | setup_timer(&host->timer, sdhci_timeout_timer, (long)host); |
| 1077 | 1077 | ||
| 1078 | ret = request_irq(host->irq, sdhci_irq, SA_SHIRQ, | 1078 | ret = request_irq(host->irq, sdhci_irq, SA_SHIRQ, |
| 1079 | host->slot_descr, host); | 1079 | host->slot_descr, host); |