Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
  spi/amba-pl022: fixing compilation warning.
  spi: Enable SPI driver for S5P6440 and S5P6450
  mmc: sdhci-of: fix build on non-powerpc platforms
  spi/imx: Add i.MX53 support
  spi/dw_spi: don't treat NULL clk as an error
  spi: tegra: don't treat NULL clk as an error

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 9469564e6888..1cf9d5faabf4 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -743,6 +743,12 @@ static struct platform_device_id spi_imx_devtype[] = {
                 .name = "imx51-ecspi",
                 .driver_data = SPI_IMX_VER_2_3,
         }, {
+                .name = "imx53-cspi",
+                .driver_data = SPI_IMX_VER_0_7,
+        }, {
+                .name = "imx53-ecspi",
+                .driver_data = SPI_IMX_VER_2_3,
+        }, {
                 /* sentinel */
         }
 };