diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:57:29 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:57:29 -0500 |
| commit | 5f3fdeb6242d84126e4bd45ac9e2246833fe8352 (patch) | |
| tree | 011ff83db06c9d42c72544e8c10c06c978ba88ce /include/linux/memory.h | |
| parent | 98a5d024eb589a863c1c79f3c3f8ecb666c0eec9 (diff) | |
| parent | b71d4da092801634d04190693a38ca03bdbe2505 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/memory.h')
| -rw-r--r-- | include/linux/memory.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h index 9a424383e6c6..dc4081b6f161 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h | |||
| @@ -85,7 +85,6 @@ struct notifier_block; | |||
| 85 | extern int register_memory_notifier(struct notifier_block *nb); | 85 | extern int register_memory_notifier(struct notifier_block *nb); |
| 86 | extern void unregister_memory_notifier(struct notifier_block *nb); | 86 | extern void unregister_memory_notifier(struct notifier_block *nb); |
| 87 | 87 | ||
| 88 | extern struct sysdev_class memory_sysdev_class; | ||
| 89 | #endif /* CONFIG_MEMORY_HOTPLUG */ | 88 | #endif /* CONFIG_MEMORY_HOTPLUG */ |
| 90 | 89 | ||
| 91 | #define hotplug_memory_notifier(fn, pri) { \ | 90 | #define hotplug_memory_notifier(fn, pri) { \ |