diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /include/linux/memory_hotplug.h | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/linux/memory_hotplug.h')
| -rw-r--r-- | include/linux/memory_hotplug.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 01f03bc06eff..968b1aa3732c 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h | |||
| @@ -6,6 +6,10 @@ | |||
| 6 | #include <linux/mmzone.h> | 6 | #include <linux/mmzone.h> |
| 7 | #include <linux/notifier.h> | 7 | #include <linux/notifier.h> |
| 8 | 8 | ||
| 9 | struct page; | ||
| 10 | struct zone; | ||
| 11 | struct pglist_data; | ||
| 12 | |||
| 9 | #ifdef CONFIG_MEMORY_HOTPLUG | 13 | #ifdef CONFIG_MEMORY_HOTPLUG |
| 10 | /* | 14 | /* |
| 11 | * pgdat resizing functions | 15 | * pgdat resizing functions |