diff options
author | 2014-02-07 11:27:30 -0800 | |
---|---|---|
committer | 2014-02-07 11:27:30 -0800 | |
commit | a3b072cd180c12e8fe0ece9487b9065808327640 (patch) | |
tree | 62b982041be84748852d77cdf6ca5639ef40858f /include/linux/reset-controller.h | |
parent | x86, microcode, AMD: Unify valid container checks (diff) | |
parent | x86/efi: Allow mapping BGRT on x86-32 (diff) | |
download | wireguard-linux-a3b072cd180c12e8fe0ece9487b9065808327640.tar.xz wireguard-linux-a3b072cd180c12e8fe0ece9487b9065808327640.zip |
Merge tag 'efi-urgent' into x86/urgent
* Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'include/linux/reset-controller.h')
-rw-r--r-- | include/linux/reset-controller.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/reset-controller.h b/include/linux/reset-controller.h index 2f61311ae3e0..41a4695fde08 100644 --- a/include/linux/reset-controller.h +++ b/include/linux/reset-controller.h @@ -21,6 +21,7 @@ struct reset_control_ops { struct module; struct device_node; +struct of_phandle_args; /** * struct reset_controller_dev - reset controller entity that might |