diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 10:12:41 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 10:12:41 +0300 |
commit | c51f2ff0075b77f272da93b7155aa666a77c8fe7 (patch) | |
tree | f229265a8d4b0407f2eaaa4fb6d1afb86ac380c5 /include/linux/cpuhotplug.h | |
parent | eddde288957957d45c42fcf51af9a059de7e0887 (diff) | |
parent | 3be7988674ab33565700a37b210f502563d932e6 (diff) | |
download | linux-c51f2ff0075b77f272da93b7155aa666a77c8fe7.tar.xz |
Merge 4.8-rc7 into usb-next
We want/need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/cpuhotplug.h')
-rw-r--r-- | include/linux/cpuhotplug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 242bf530edfc..34bd80512a0c 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -1,6 +1,8 @@ #ifndef __CPUHOTPLUG_H #define __CPUHOTPLUG_H +#include <linux/types.h> + enum cpuhp_state { CPUHP_OFFLINE, CPUHP_CREATE_THREADS, |