diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:21:19 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 13:52:58 -0500 |
commit | 610141ee651cee2cd27584434aa9dd9d967f0089 (patch) | |
tree | e2ce67885df12377d8ad8e2a39f426a0a26b5fd4 | |
parent | e3a1a5ec5cd516c85848611992102fc00e8af601 (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>
-rw-r--r-- | lib/Makefile | 3 |
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 \ | |||
12 | idr.o int_sqrt.o extable.o \ | 12 | idr.o int_sqrt.o extable.o \ |
13 | sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \ | 13 | sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \ |
14 | proportions.o flex_proportions.o prio_heap.o ratelimit.o show_mem.o \ | 14 | proportions.o flex_proportions.o prio_heap.o ratelimit.o show_mem.o \ |
15 | is_single_threaded.o plist.o decompress.o | 15 | is_single_threaded.o plist.o decompress.o kobject_uevent.o |
16 | 16 | ||
17 | lib-$(CONFIG_MMU) += ioremap.o | 17 | lib-$(CONFIG_MMU) += ioremap.o |
18 | lib-$(CONFIG_SMP) += cpumask.o | 18 | lib-$(CONFIG_SMP) += cpumask.o |
@@ -31,7 +31,6 @@ CFLAGS_kobject.o += -DDEBUG | |||
31 | CFLAGS_kobject_uevent.o += -DDEBUG | 31 | CFLAGS_kobject_uevent.o += -DDEBUG |
32 | endif | 32 | endif |
33 | 33 | ||
34 | lib-$(CONFIG_HOTPLUG) += kobject_uevent.o | ||
35 | obj-$(CONFIG_GENERIC_IOMAP) += iomap.o | 34 | obj-$(CONFIG_GENERIC_IOMAP) += iomap.o |
36 | obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o | 35 | obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o |
37 | obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o | 36 | obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o |