Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[pandora-kernel.git] / arch / arm / mach-davinci / dm355.c

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 2652af1..a5f8a80 100644 (file)
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -412,12 +412,7 @@ static struct resource dm355_spi0_resources[] = {
 static struct davinci_spi_platform_data dm355_spi0_pdata = {
        .version        = SPI_VERSION_1,
        .num_chipselect = 2,
-       .clk_internal   = 1,
-       .cs_hold        = 1,
-       .intr_level     = 0,
-       .poll_mode      = 1,    /* 0 -> interrupt mode 1-> polling mode */
-       .c2tdelay       = 0,
-       .t2cdelay       = 0,
+       .cshold_bug     = true,
 };
 static struct platform_device dm355_spi0_device = {
        .name = "spi_davinci",