summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:21:19 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 10:52:58 -0800
commit610141ee651cee2cd27584434aa9dd9d967f0089 (patch)
treee2ce67885df12377d8ad8e2a39f426a0a26b5fd4 /lib
parente3a1a5ec5cd516c85848611992102fc00e8af601 (diff)
lib: kobject_uevent is no longer dependant on CONFIG_HOTPLUG
CONFIG_HOTPLUG is being removed so kobject_uevent needs to always be part of the library. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 821a16229111..66787b9f6616 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -12,7 +12,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
idr.o int_sqrt.o extable.o \
sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \
proportions.o flex_proportions.o prio_heap.o ratelimit.o show_mem.o \
- is_single_threaded.o plist.o decompress.o
+ is_single_threaded.o plist.o decompress.o kobject_uevent.o
lib-$(CONFIG_MMU) += ioremap.o
lib-$(CONFIG_SMP) += cpumask.o
@@ -31,7 +31,6 @@ CFLAGS_kobject.o += -DDEBUG
CFLAGS_kobject_uevent.o += -DDEBUG
endif
-lib-$(CONFIG_HOTPLUG) += kobject_uevent.o
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o