diff options
| author | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
| commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
| tree | b1ce838a37044bb38dfc128e2116ca35630e629a /arch/sparc/lib/Makefile | |
| parent | 22b737f4c75197372d64afc6ed1bccd58c00e549 (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
Diffstat (limited to 'arch/sparc/lib/Makefile')
| -rw-r--r-- | arch/sparc/lib/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index e75faf0e59ae..c4b5e03af115 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile | |||
| @@ -44,3 +44,4 @@ obj-y += iomap.o | |||
| 44 | obj-$(CONFIG_SPARC32) += atomic32.o | 44 | obj-$(CONFIG_SPARC32) += atomic32.o |
| 45 | obj-y += ksyms.o | 45 | obj-y += ksyms.o |
| 46 | obj-$(CONFIG_SPARC64) += PeeCeeI.o | 46 | obj-$(CONFIG_SPARC64) += PeeCeeI.o |
| 47 | obj-y += usercopy.o | ||