h63xx: touchscreen support

[linux-2.6-omap-h63xx.git] / drivers / input / touchscreen / omap / omap_ts.c

diff --git a/drivers/input/touchscreen/omap/omap_ts.c b/drivers/input/touchscreen/omap/omap_ts.c
index b55dc9e42b89403bbd343ff0fc22493a4a768e3e..1063794deec0606d222b726a26b3b6a3257b5d09 100644 (file)
--- a/drivers/input/touchscreen/omap/omap_ts.c
+++ b/drivers/input/touchscreen/omap/omap_ts.c
@@ -46,7 +46,7 @@
 #define OMAP_TS_NAME   "omap_ts"
 
 static struct ts_device *__initdata ts_devs[] = {
-#if defined(CONFIG_MACH_OMAP_H2) || defined(CONFIG_MACH_OMAP_H3)
+#if defined(CONFIG_MACH_OMAP_H2) || defined(CONFIG_MACH_OMAP_H3) || defined(CONFIG_MACH_OMAP_H6300)
        &hx_ts,
 #endif
 #ifdef CONFIG_MACH_OMAP_OSK
@@ -162,7 +162,8 @@ static int __init omap_ts_probe(struct platform_device *pdev)
 
        /* request irq */
        if (ts_omap.irq != -1) {
-               if (request_irq(ts_omap.irq, omap_ts_handler, ts_omap.irq_type,
+               if (request_irq(ts_omap.irq, omap_ts_handler,
+                               SA_SAMPLE_RANDOM | ts_omap.irq_type,
                                OMAP_TS_NAME, &ts_omap)) {
                        printk(KERN_ERR
          "omap_ts.c: Could not allocate touchscreen IRQ!\n");
@@ -227,7 +228,7 @@ static struct platform_driver omap_ts_driver = {
        .remove         = omap_ts_remove,
        .suspend        = omap_ts_suspend,
        .resume         = omap_ts_resume,
-       .driver {
+       .driver = {
                .name   = OMAP_TS_NAME,
        },
 };