Merge remote-tracking branch 'spi/spi/next'

Conflicts:
	drivers/spi/spi-pl022.c

diff --cc drivers/spi/spi-pl022.c
index 3520cf955b95c6c3b7e05614e5b3755e8787c0a1,02b2edaa88b27f5ab0ccd701816e2b5c8828200b..1dd3d175894350411b792388219fbb2a71afa0ef
--- 1/drivers/spi/spi-pl022.c
--- 2/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@@ -2235,8 -2237,11 +2225,10 @@@ pl022_probe(struct amba_device *adev, c
   err_start_queue:
   err_init_queue:
        destroy_queue(pl022);
-       pl022_dma_remove(pl022);
+       if (platform_info->enable_dma)
+               pl022_dma_remove(pl022);
+ 
        free_irq(adev->irq[0], pl022);
 -      pm_runtime_disable(&adev->dev);
   err_no_irq:
        clk_put(pl022->clk);
   err_no_clk:
@@@ -2429,9 -2404,10 +2422,8 @@@ static struct amba_driver pl022_driver 
        .id_table       = pl022_ids,
        .probe          = pl022_probe,
        .remove         = __devexit_p(pl022_remove),
 -      .suspend        = pl022_suspend,
 -      .resume         = pl022_resume,
  };
  
- 
  static int __init pl022_init(void)
  {
        return amba_driver_register(&pl022_driver);