Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / include / linux / nsc_gpio.h

diff --git a/include/linux/nsc_gpio.h b/include/linux/nsc_gpio.h
index 3ad8ae9dcb5a142d13b35642b9276b54e963643c..7da0cf3702ee05692f1d65fea8a8ad7344106b97 100644 (file)
--- a/include/linux/nsc_gpio.h
+++ b/include/linux/nsc_gpio.h
@@ -22,12 +22,19 @@
 struct nsc_gpio_ops {
        struct module*  owner;
        u32     (*gpio_config)  (unsigned iminor, u32 mask, u32 bits);
-       void    (*gpio_dump)    (unsigned iminor);
+       void    (*gpio_dump)    (struct nsc_gpio_ops *amp, unsigned iminor);
        int     (*gpio_get)     (unsigned iminor);
        void    (*gpio_set)     (unsigned iminor, int state);
-       void    (*gpio_set_high)(unsigned iminor);
-       void    (*gpio_set_low) (unsigned iminor);
        void    (*gpio_change)  (unsigned iminor);
        int     (*gpio_current) (unsigned iminor);
+       struct device*  dev;    /* for dev_dbg() support, set in init  */
 };
 
+extern ssize_t nsc_gpio_write(struct file *file, const char __user *data,
+                             size_t len, loff_t *ppos);
+
+extern ssize_t nsc_gpio_read(struct file *file, char __user *buf,
+                            size_t len, loff_t *ppos);
+
+extern void nsc_gpio_dump(struct nsc_gpio_ops *amp, unsigned index);
+