diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
| commit | 92907cbbef8625bb3998d1eb385fc88f23c97a3f (patch) | |
| tree | 15626ff9287e37c3cb81c7286d6db5a7fd77c854 /include/linux/spmi.h | |
| parent | 15fbfccfe92c62ae8d1ecc647c44157ed01ac02e (diff) | |
| parent | 1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff) | |
Merge tag 'v4.4-rc2' into drm-intel-next-queued
Linux 4.4-rc2
Backmerge to get at
commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date: Thu Nov 5 23:04:11 2015 +0200
drm/i915/skl: disable display side power well support for now
so that we can proplery re-eanble skl power wells in -next.
Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/linux/spmi.h')
| -rw-r--r-- | include/linux/spmi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/spmi.h b/include/linux/spmi.h index f84212cd3b7d..1396a255d2a2 100644 --- a/include/linux/spmi.h +++ b/include/linux/spmi.h | |||
| @@ -153,7 +153,9 @@ static inline struct spmi_driver *to_spmi_driver(struct device_driver *d) | |||
| 153 | return container_of(d, struct spmi_driver, driver); | 153 | return container_of(d, struct spmi_driver, driver); |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | int spmi_driver_register(struct spmi_driver *sdrv); | 156 | #define spmi_driver_register(sdrv) \ |
| 157 | __spmi_driver_register(sdrv, THIS_MODULE) | ||
| 158 | int __spmi_driver_register(struct spmi_driver *sdrv, struct module *owner); | ||
| 157 | 159 | ||
| 158 | /** | 160 | /** |
| 159 | * spmi_driver_unregister() - unregister an SPMI client driver | 161 | * spmi_driver_unregister() - unregister an SPMI client driver |