Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

[sfrench/cifs-2.6.git] / drivers / input / touchscreen / s3c2410_ts.c

diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index e0b7c834111d37467b1b6454828f5ad071ddcae9..6085d12fd56196e0e47873bade9b4880ab5ca356 100644 (file)
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -173,7 +173,7 @@ static irqreturn_t stylus_irq(int irq, void *dev_id)
        if (down)
                s3c_adc_start(ts.client, 0, 1 << ts.shift);
        else
-               dev_info(ts.dev, "%s: count=%d\n", __func__, ts.count);
+               dev_dbg(ts.dev, "%s: count=%d\n", __func__, ts.count);
 
        if (ts.features & FEAT_PEN_IRQ) {
                /* Clear pen down/up interrupt */
@@ -413,6 +413,8 @@ static struct dev_pm_ops s3c_ts_pmops = {
 #endif
 
 static struct platform_device_id s3cts_driver_ids[] = {
+       { "s3c2410-ts", 0 },
+       { "s3c2440-ts", 0 },
        { "s3c64xx-ts", FEAT_PEN_IRQ },
        { }
 };