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

[pandora-kernel.git] / arch / arm / plat-omap / include / plat / gpio.h

diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h
index aedd732..91e8de3 100644 (file)
--- a/arch/arm/plat-omap/include/plat/gpio.h
+++ b/arch/arm/plat-omap/include/plat/gpio.h
@@ -175,6 +175,7 @@ struct omap_gpio_dev_attr {
 };
 
 struct omap_gpio_reg_offs {
+       u16 revision;
        u16 direction;
        u16 datain;
        u16 dataout;
@@ -182,6 +183,13 @@ struct omap_gpio_reg_offs {
        u16 clr_dataout;
        u16 irqstatus;
        u16 irqstatus2;
+       u16 irqenable;
+       u16 set_irqenable;
+       u16 clr_irqenable;
+       u16 debounce;
+       u16 debounce_en;
+
+       bool irqenable_inv;
 };
 
 struct omap_gpio_platform_data {