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-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'devel-cleanup' into omap-for-linus

Browse source 
Conflicts:
	arch/arm/mach-omap2/timer-gp.c
This commit is contained in:
Tony Lindgren 2011-03-02 17:07:14 -08:00
commit 12d7d4e0ed
359 changed files with 3662 additions and 3127 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/mtd/nand/r852.c
View file

@ -930,7 +930,7 @@ int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
init_completion(&dev->dma_done);
dev->card_workqueue = create_freezeable_workqueue(DRV_NAME);
dev->card_workqueue = create_freezable_workqueue(DRV_NAME);
if (!dev->card_workqueue)
goto error9;

2
drivers/mtd/sm_ftl.c
View file

@ -1258,7 +1258,7 @@ static struct mtd_blktrans_ops sm_ftl_ops = {
static __init int sm_module_init(void)
{
int error = 0;
cache_flush_workqueue = create_freezeable_workqueue("smflush");
cache_flush_workqueue = create_freezable_workqueue("smflush");
if (IS_ERR(cache_flush_workqueue))
return PTR_ERR(cache_flush_workqueue);