Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / corgi_ssp.c

diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c
index 136c269db0b7965c8b2a93e9c4abc326ab56714d..bdf10cfa94407763b2c46a99d71dc31d7fcaf159 100644 (file)
--- a/arch/arm/mach-pxa/corgi_ssp.c
+++ b/arch/arm/mach-pxa/corgi_ssp.c
@@ -15,7 +15,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 
@@ -203,7 +203,7 @@ static int __init corgi_ssp_probe(struct device *dev)
        GPDR(ssp_machinfo->cs_ads7846) |= GPIO_bit(ssp_machinfo->cs_ads7846);  /* output */
        GPSR(ssp_machinfo->cs_ads7846) = GPIO_bit(ssp_machinfo->cs_ads7846);   /* High - Disable ADS7846*/
 
-       ret = ssp_init(&corgi_ssp_dev,ssp_machinfo->port);
+       ret = ssp_init(&corgi_ssp_dev, ssp_machinfo->port, 0);
 
        if (ret)
                printk(KERN_ERR "Unable to register SSP handler!\n");