summaryrefslogtreecommitdiffstats
path: root/include/linux/memory.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2006-01-03 18:18:01 +1100
committerDave Airlie <airlied@linux.ie>2006-01-03 18:18:01 +1100
commit97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch)
treebb6e3b2949459f54f884c710fc74d40eef00d834 /include/linux/memory.h
parentd985c1088146607532093d9eaaaf99758f6a4d21 (diff)
parent88026842b0a760145aa71d69e74fbc9ec118ca44 (diff)
downloadkernel-crypto-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.gz
kernel-crypto-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.xz
kernel-crypto-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.zip
drm: merge in Linus mainline
Diffstat (limited to 'include/linux/memory.h')
-rw-r--r--include/linux/memory.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h
index 9a424383e6c..dc4081b6f16 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -85,7 +85,6 @@ struct notifier_block;
extern int register_memory_notifier(struct notifier_block *nb);
extern void unregister_memory_notifier(struct notifier_block *nb);
-extern struct sysdev_class memory_sysdev_class;
#endif /* CONFIG_MEMORY_HOTPLUG */
#define hotplug_memory_notifier(fn, pri) { \