lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel

Browse Source
This commit is contained in:
Russell King
2009-05-29 10:04:24 +01:00
committed by Russell King
parent 9af5324a07 77bbca138c
commit 42f1d2e06a
251 changed files with 14657 additions and 1351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mmc/host/mmci.c
View File

@@ -490,7 +490,7 @@ static void mmci_check_status(unsigned long data)
mod_timer(&host->timer, jiffies + HZ);
}
static int __devinit mmci_probe(struct amba_device *dev, void *id)
static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
{
struct mmc_platform_data *plat = dev->dev.platform_data;
struct mmci_host *host;