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

Merge branch 'master' into for-2.6.31

Browse Source 
Conflicts:
	drivers/ide/ide-io.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe
2009-05-22 20:28:35 +02:00
parent e4b636366c 6a44587ee7
commit 9bd7de51ee
99 changed files with 559 additions and 384 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;