A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into for-2.6.31

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

Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
Jens Axboe 2009-05-22 20:28:35 +02:00
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;