diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-21 05:03:50 +0100 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-21 05:03:50 +0100 |
commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /drivers/base/memory.c | |
parent | Input: add the fn key to hid-debug.h (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
download | linux-041387d98460b3947587929ef3a4773b8c48538f.tar.xz linux-041387d98460b3947587929ef3a4773b8c48538f.zip |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'drivers/base/memory.c')
-rw-r--r-- | drivers/base/memory.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index b7ddd651d664..bc3ca6a656b2 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -28,7 +28,6 @@ static struct sysdev_class memory_sysdev_class = { set_kset_name(MEMORY_CLASS_NAME), }; -EXPORT_SYMBOL(memory_sysdev_class); static char *memory_hotplug_name(struct kset *kset, struct kobject *kobj) { |