diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/char/pc8736x_gpio.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/char/pc8736x_gpio.c')
| -rw-r--r-- | drivers/char/pc8736x_gpio.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c index 3f7da8cf3a80..8ecbcc174c15 100644 --- a/drivers/char/pc8736x_gpio.c +++ b/drivers/char/pc8736x_gpio.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/mutex.h> | 20 | #include <linux/mutex.h> |
| 21 | #include <linux/nsc_gpio.h> | 21 | #include <linux/nsc_gpio.h> |
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/smp_lock.h> | ||
| 24 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
| 25 | 24 | ||
| 26 | #define DEVNAME "pc8736x_gpio" | 25 | #define DEVNAME "pc8736x_gpio" |
| @@ -223,7 +222,6 @@ static int pc8736x_gpio_open(struct inode *inode, struct file *file) | |||
| 223 | unsigned m = iminor(inode); | 222 | unsigned m = iminor(inode); |
| 224 | file->private_data = &pc8736x_gpio_ops; | 223 | file->private_data = &pc8736x_gpio_ops; |
| 225 | 224 | ||
| 226 | cycle_kernel_lock(); | ||
| 227 | dev_dbg(&pdev->dev, "open %d\n", m); | 225 | dev_dbg(&pdev->dev, "open %d\n", m); |
| 228 | 226 | ||
| 229 | if (m >= PC8736X_GPIO_CT) | 227 | if (m >= PC8736X_GPIO_CT) |