aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-10-05 13:08:12 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-10-05 13:08:12 +0000
commit5d46bb5efce086255b76530781281f270f813ae2 (patch)
tree630af70787e606ee6d769049eb94963f4d81fc96 /target
parent6bfeb815486de741db535b4c93b5d7f9aeb2b3c5 (diff)
downloadupstream-5d46bb5efce086255b76530781281f270f813ae2.tar.gz
upstream-5d46bb5efce086255b76530781281f270f813ae2.tar.bz2
upstream-5d46bb5efce086255b76530781281f270f813ae2.zip
make gpio_dev compatible with GPIOLIB & GPIO_SYSFS (closes #4016)
SVN-Revision: 12864
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c6
-rw-r--r--target/linux/generic-2.6/files-2.6.26/drivers/char/gpio_dev.c6
-rw-r--r--target/linux/generic-2.6/files-2.6.27/drivers/char/gpio_dev.c6
-rw-r--r--target/linux/generic-2.6/files/drivers/char/gpio_dev.c6
4 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c
index 48ef76f8a9..4dc637471c 100644
--- a/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c
+++ b/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c
@@ -37,7 +37,7 @@
static int dev_major;
static unsigned int gpio_access_mask;
-static struct class *gpio_class;
+static struct class *gpiodev_class;
/* Counter is 1, if the device is not opened and zero (or less) if opened. */
static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
@@ -141,8 +141,8 @@ gpio_probe(struct platform_device *dev)
goto out;
}
- gpio_class = class_create(THIS_MODULE, DEVNAME);
- class_device_create(gpio_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME);
+ gpiodev_class = class_create(THIS_MODULE, DRVNAME);
+ class_device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME);
printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);
diff --git a/target/linux/generic-2.6/files-2.6.26/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files-2.6.26/drivers/char/gpio_dev.c
index b09ebeffad..b82d2f13e5 100644
--- a/target/linux/generic-2.6/files-2.6.26/drivers/char/gpio_dev.c
+++ b/target/linux/generic-2.6/files-2.6.26/drivers/char/gpio_dev.c
@@ -37,7 +37,7 @@
static int dev_major;
static unsigned int gpio_access_mask;
-static struct class *gpio_class;
+static struct class *gpiodev_class;
/* Counter is 1, if the device is not opened and zero (or less) if opened. */
static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
@@ -141,8 +141,8 @@ gpio_probe(struct platform_device *dev)
goto out;
}
- gpio_class = class_create(THIS_MODULE, DEVNAME);
- device_create(gpio_class, NULL, MKDEV(dev_major, 0), DEVNAME);
+ gpiodev_class = class_create(THIS_MODULE, DRVNAME);
+ device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), DEVNAME);
printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);
diff --git a/target/linux/generic-2.6/files-2.6.27/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files-2.6.27/drivers/char/gpio_dev.c
index 3fbf3a58cb..8392fcf2d6 100644
--- a/target/linux/generic-2.6/files-2.6.27/drivers/char/gpio_dev.c
+++ b/target/linux/generic-2.6/files-2.6.27/drivers/char/gpio_dev.c
@@ -37,7 +37,7 @@
static int dev_major;
static unsigned int gpio_access_mask;
-static struct class *gpio_class;
+static struct class *gpiodev_class;
/* Counter is 1, if the device is not opened and zero (or less) if opened. */
static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
@@ -141,8 +141,8 @@ gpio_probe(struct platform_device *dev)
goto out;
}
- gpio_class = class_create(THIS_MODULE, DEVNAME);
- device_create(gpio_class, NULL, MKDEV(dev_major, 0), dev, DEVNAME);
+ gpiodev_class = class_create(THIS_MODULE, DRVNAME);
+ device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), dev, DEVNAME);
printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);
diff --git a/target/linux/generic-2.6/files/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files/drivers/char/gpio_dev.c
index 48ef76f8a9..4dc637471c 100644
--- a/target/linux/generic-2.6/files/drivers/char/gpio_dev.c
+++ b/target/linux/generic-2.6/files/drivers/char/gpio_dev.c
@@ -37,7 +37,7 @@
static int dev_major;
static unsigned int gpio_access_mask;
-static struct class *gpio_class;
+static struct class *gpiodev_class;
/* Counter is 1, if the device is not opened and zero (or less) if opened. */
static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
@@ -141,8 +141,8 @@ gpio_probe(struct platform_device *dev)
goto out;
}
- gpio_class = class_create(THIS_MODULE, DEVNAME);
- class_device_create(gpio_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME);
+ gpiodev_class = class_create(THIS_MODULE, DRVNAME);
+ class_device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME);
printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);