diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/devfreq.h | 2 | ||||
| -rw-r--r-- | include/linux/hwspinlock.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index afb94583960c..98ce8124b1cc 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h | |||
| @@ -41,7 +41,7 @@ struct devfreq_dev_status { | |||
| 41 | unsigned long total_time; | 41 | unsigned long total_time; |
| 42 | unsigned long busy_time; | 42 | unsigned long busy_time; |
| 43 | unsigned long current_frequency; | 43 | unsigned long current_frequency; |
| 44 | void *private_date; | 44 | void *private_data; |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
diff --git a/include/linux/hwspinlock.h b/include/linux/hwspinlock.h index 08a2fee40659..aad6bd4b3efd 100644 --- a/include/linux/hwspinlock.h +++ b/include/linux/hwspinlock.h | |||
| @@ -118,7 +118,6 @@ int __hwspin_trylock(struct hwspinlock *hwlock, int mode, unsigned long *flags) | |||
| 118 | static inline | 118 | static inline |
| 119 | void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags) | 119 | void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags) |
| 120 | { | 120 | { |
| 121 | return 0; | ||
| 122 | } | 121 | } |
| 123 | 122 | ||
| 124 | static inline int hwspin_lock_get_id(struct hwspinlock *hwlock) | 123 | static inline int hwspin_lock_get_id(struct hwspinlock *hwlock) |
