Merge remote-tracking branches 'spi/topic/pl022', 'spi/topic/pxa2xx', 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi-pl022.c
Simple merge

diff --cc drivers/spi/spi-sirf.c
index 6f0602fd74012f298467397f0aca2d15709a5d15,95ac276eaafe6ab7a6c1f6b82aede8bad00bdac0,95ac276eaafe6ab7a6c1f6b82aede8bad00bdac0,95ac276eaafe6ab7a6c1f6b82aede8bad00bdac0,95ac276eaafe6ab7a6c1f6b82aede8bad00bdac0,adbabbdfc7f0e0bd91e4edf1dfea1d0e142e5729..39e2c0a55a2865acc6c50354cf90fa27263bc922
--- 1/drivers/spi/spi-sirf.c
--- 2/drivers/spi/spi-sirf.c
--- 3/drivers/spi/spi-sirf.c
--- 4/drivers/spi/spi-sirf.c
--- 5/drivers/spi/spi-sirf.c
--- 6/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@@@@@@ -641,19 -638,19 -638,19 -638,19 -638,19 -643,10 +646,10 @@@@@@@ static int spi_sirfsoc_probe(struct pla
        struct sirfsoc_spi *sspi;
        struct spi_master *master;
        struct resource *mem_res;
-----   int num_cs, cs_gpio, irq;
-----   int i;
-----   int ret;
-     
-       ret = of_property_read_u32(pdev->dev.of_node,
-                       "sirf,spi-num-chipselects", &num_cs);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Unable to get chip select number\n");
-               goto err_cs;
-       }
+++++   int irq;
+++++   int i, ret;
      
 ----   ret = of_property_read_u32(pdev->dev.of_node,
 ----                   "sirf,spi-num-chipselects", &num_cs);
 ----   if (ret < 0) {
 ----           dev_err(&pdev->dev, "Unable to get chip select number\n");
 ----           goto err_cs;
 ----   }
 ---- 
-----   master = spi_alloc_master(&pdev->dev,
-----                   sizeof(*sspi) + sizeof(int) * num_cs);
+++++   master = spi_alloc_master(&pdev->dev, sizeof(*sspi));
        if (!master) {
                dev_err(&pdev->dev, "Unable to allocate SPI master\n");
                return -ENOMEM;