char: Drop bogus dependency of DEVPORT on !M68K

[pandora-kernel.git] / drivers / char / nsc_gpio.c

diff --git a/drivers/char/nsc_gpio.c b/drivers/char/nsc_gpio.c
index 5b91e4e..808d44e 100644 (file)
--- a/drivers/char/nsc_gpio.c
+++ b/drivers/char/nsc_gpio.c
@@ -7,7 +7,6 @@
    Copyright (c) 2005      Jim Cromie <jim.cromie@gmail.com>
 */
 
-#include <linux/config.h>
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/errno.h>
@@ -42,7 +41,7 @@ void nsc_gpio_dump(struct nsc_gpio_ops *amp, unsigned index)
 ssize_t nsc_gpio_write(struct file *file, const char __user *data,
                       size_t len, loff_t *ppos)
 {
-       unsigned m = iminor(file->f_dentry->d_inode);
+       unsigned m = iminor(file->f_path.dentry->d_inode);
        struct nsc_gpio_ops *amp = file->private_data;
        struct device *dev = amp->dev;
        size_t i;
@@ -68,13 +67,11 @@ ssize_t nsc_gpio_write(struct file *file, const char __user *data,
                        amp->gpio_config(m, ~1, 0);
                        break;
                case 'T':
-                       dev_dbg(dev, "GPIO%d output is push pull\n",
-                              m);
+                       dev_dbg(dev, "GPIO%d output is push pull\n", m);
                        amp->gpio_config(m, ~2, 2);
                        break;
                case 't':
-                       dev_dbg(dev, "GPIO%d output is open drain\n",
-                              m);
+                       dev_dbg(dev, "GPIO%d output is open drain\n", m);
                        amp->gpio_config(m, ~2, 0);
                        break;
                case 'P':
@@ -107,7 +104,7 @@ ssize_t nsc_gpio_write(struct file *file, const char __user *data,
 ssize_t nsc_gpio_read(struct file *file, char __user * buf,
                      size_t len, loff_t * ppos)
 {
-       unsigned m = iminor(file->f_dentry->d_inode);
+       unsigned m = iminor(file->f_path.dentry->d_inode);
        int value;
        struct nsc_gpio_ops *amp = file->private_data;