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

[pandora-kernel.git] / drivers / input / mouse / synaptics_i2c.c

diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c
index cba3c84..4b755cb 100644 (file)
--- a/drivers/input/mouse/synaptics_i2c.c
+++ b/drivers/input/mouse/synaptics_i2c.c
@@ -570,7 +570,7 @@ static int __devinit synaptics_i2c_probe(struct i2c_client *client,
                         "Requesting IRQ: %d\n", touch->client->irq);
 
                ret = request_irq(touch->client->irq, synaptics_i2c_irq,
-                                 IRQF_DISABLED|IRQ_TYPE_EDGE_FALLING,
+                                 IRQ_TYPE_EDGE_FALLING,
                                  DRIVER_NAME, touch);
                if (ret) {
                        dev_warn(&touch->client->dev,
@@ -619,7 +619,7 @@ static int __devexit synaptics_i2c_remove(struct i2c_client *client)
        return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int synaptics_i2c_suspend(struct device *dev)
 {
        struct i2c_client *client = to_i2c_client(dev);