diff options
| author |   Len Brown <len.brown@intel.com> | 2011-08-03 11:30:42 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-08-03 11:30:42 -0400 |
| commit | d0e323b47057f4492b8fa22345f38d80a469bf8d (patch) | |
| tree | feb760c7e2cdb1e43640417409428ab858910ea3 /lib/Makefile | |
| parent | oom: task->mm == NULL doesn't mean the memory was freed (diff) | |
| parent | ACPI, APEI, EINJ Param support is disabled by default (diff) | |
| download | linux-dev-d0e323b47057f4492b8fa22345f38d80a469bf8d.tar.xz linux-dev-d0e323b47057f4492b8fa22345f38d80a469bf8d.zip | |
Merge branch 'apei' into apei-release
Some trivial conflicts due to other various merges
adding to the end of common lists sooner than this one.
arch/ia64/Kconfig
arch/powerpc/Kconfig
arch/x86/Kconfig
lib/Kconfig
lib/Makefile
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index 892f4e282ea1..6457af4a7caf 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -115,6 +115,8 @@ obj-$(CONFIG_CPU_RMAP) += cpu_rmap.o obj-$(CONFIG_CORDIC) += cordic.o +obj-$(CONFIG_LLIST) += llist.o + hostprogs-y := gen_crc32table clean-files := crc32table.h |