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

Merge remote-tracking branch 'pwm/for-next'
---

b8cb461dfb29a060370eb2d8de4b5fb90508e804
diff --cc include/linux/pwm.h
index 70655a205b74,3fef47733ea3..a4df2042b79c
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@@ -174,14 -177,13 +177,16 @@@ struct pwm_device *pwm_request_from_chi
  struct pwm_device *of_pwm_xlate_with_flags(struct pwm_chip *pc,
  		const struct of_phandle_args *args);
  
 -struct pwm_device *pwm_get(struct device *dev, const char *consumer);
 +struct pwm_device *pwm_get(struct device *dev, const char *con_id);
 +struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id);
  void pwm_put(struct pwm_device *pwm);
  
 -struct pwm_device *devm_pwm_get(struct device *dev, const char *consumer);
 +struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id);
 +struct pwm_device *devm_of_pwm_get(struct device *dev, struct device_node *np,
 +				   const char *con_id);
  void devm_pwm_put(struct device *dev, struct pwm_device *pwm);
+ 
+ bool pwm_can_sleep(struct pwm_device *pwm);
  #else
  static inline int pwm_set_chip_data(struct pwm_device *pwm, void *data)
  {