diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-09 17:33:22 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-09 17:33:22 -0500 |
| commit | e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b (patch) | |
| tree | 69d5685ef0c194f651a03e30bff14628b4d45400 /include/linux/memory.h | |
| parent | ec58ef03284f0bfa50a04982b74c8c2325a0758e (diff) | |
| parent | ad8f76be48d817b48222411ae16a7dfe257bdb24 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/memory.h')
| -rw-r--r-- | include/linux/memory.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h index 0def328ab5cf..9a424383e6c6 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h | |||
| @@ -54,6 +54,9 @@ struct memory_block { | |||
| 54 | */ | 54 | */ |
| 55 | #define MEM_MAPPING_INVALID (1<<3) | 55 | #define MEM_MAPPING_INVALID (1<<3) |
| 56 | 56 | ||
| 57 | struct notifier_block; | ||
| 58 | struct mem_section; | ||
| 59 | |||
| 57 | #ifndef CONFIG_MEMORY_HOTPLUG | 60 | #ifndef CONFIG_MEMORY_HOTPLUG |
| 58 | static inline int memory_dev_init(void) | 61 | static inline int memory_dev_init(void) |
| 59 | { | 62 | { |