Skip to content

L
linux-davinci
Commit c9ab0971 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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
parents ff914453 12223dab
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
MAINTAINERS
View file @ c9ab0971
...@@ -1895,7 +1895,7 @@ L: linux-kernel@vger.kernel.org ...@@ -1895,7 +1895,7 @@ L: linux-kernel@vger.kernel.org
W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
S: Maintained S: Maintained
MULTIMEDIA CARD SUBSYSTEM MULTIMEDIA CARD (MMC) SUBSYSTEM
P: Russell King P: Russell King
M: rmk+mmc@arm.linux.org.uk M: rmk+mmc@arm.linux.org.uk
S: Maintained S: Maintained
......
drivers/mmc/sdhci.c
View file @ c9ab0971
...@@ -1073,7 +1073,7 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot) ...@@ -1073,7 +1073,7 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
tasklet_init(&host->finish_tasklet, tasklet_init(&host->finish_tasklet,
sdhci_tasklet_finish, (unsigned long)host); sdhci_tasklet_finish, (unsigned long)host);
setup_timer(&host->timer, sdhci_timeout_timer, (int)host); setup_timer(&host->timer, sdhci_timeout_timer, (long)host);
ret = request_irq(host->irq, sdhci_irq, SA_SHIRQ, ret = request_irq(host->irq, sdhci_irq, SA_SHIRQ,
host->slot_descr, host); host->slot_descr, host);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment