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

[mirror_ubuntu-artful-kernel.git] / drivers / gpio / gpiolib.h

diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h
index 2b87cbd68478ca0526676d1382acf80f70b22d3f..be3a977d0349d4c99b435f0f1dcce7dd0c9ef867 100644 (file)
--- a/drivers/gpio/gpiolib.h
+++ b/drivers/gpio/gpiolib.h
@@ -26,7 +26,8 @@ struct acpi_device;
  */
 struct acpi_gpio_info {
        bool gpioint;
-       bool active_low;
+       int polarity;
+       int triggering;
 };
 
 /* gpio suffixes used for ACPI and device tree lookup */