From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 05:04:00 +0000 (+1100)
Subject: Merge remote-tracking branch 'gpio/gpio/next'
X-Git-Tag: next-20130220~20
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6bcba589e70b8f3fb4696e652fd3473157441e31;p=karo-tx-linux.git

Merge remote-tracking branch 'gpio/gpio/next'
---

6bcba589e70b8f3fb4696e652fd3473157441e31
diff --cc drivers/gpio/gpiolib.c
index 5359ca78130f,4b3f388bcc6d..4828fe7c66cb
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@@ -801,12 -819,18 +819,18 @@@ fail_unregister_device
  	device_unregister(dev);
  fail_unlock:
  	mutex_unlock(&sysfs_lock);
- 	pr_debug("%s: gpio%d status %d\n", __func__, gpio, status);
+ 	pr_debug("%s: gpio%d status %d\n", __func__, desc_to_gpio(desc),
+ 		 status);
  	return status;
  }
+ 
+ int gpio_export(unsigned gpio, bool direction_may_change)
+ {
+ 	return gpiod_export(gpio_to_desc(gpio), direction_may_change);
+ }
  EXPORT_SYMBOL_GPL(gpio_export);
  
 -static int match_export(struct device *dev, void *data)
 +static int match_export(struct device *dev, const void *data)
  {
  	return dev_get_drvdata(dev) == data;
  }