diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-12 14:07:13 -0700 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-12 14:07:13 -0700 |
| commit | 586c7ecc78949f03c9f31735f4935abef38f8f2b (patch) | |
| tree | d7c6c955f0e00e77bb80a3b576b49721c7c2d69b /include/linux/memory_hotplug.h | |
| parent | 9c93ac87d736814b8b6dfe4dae3ea6474a21fce3 (diff) | |
| parent | e96766958c914f1240317c967bb322cd3731fb17 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next
Diffstat (limited to 'include/linux/memory_hotplug.h')
| -rw-r--r-- | include/linux/memory_hotplug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 0b8e2a742600..910550f3b70e 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -4,6 +4,7 @@ #include <linux/mmzone.h> #include <linux/spinlock.h> #include <linux/notifier.h> +#include <linux/bug.h> struct page; struct zone; |