diff options
| author | Takashi Iwai | 2011-08-08 14:30:44 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2011-08-08 14:30:44 +0200 |
| commit | 60b1ae0cd469825e4db0837f5f19c3a8084300c3 (patch) | |
| tree | 563aafa40012d1bb8218987ffeb76c88743e18e5 /arch/arm/lib/Makefile | |
| parent | Merge branch 'fix/kconfig' into for-linus (diff) | |
| parent | Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | kernel-qcow2-linux-60b1ae0cd469825e4db0837f5f19c3a8084300c3.tar.gz kernel-qcow2-linux-60b1ae0cd469825e4db0837f5f19c3a8084300c3.tar.xz kernel-qcow2-linux-60b1ae0cd469825e4db0837f5f19c3a8084300c3.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'arch/arm/lib/Makefile')
| -rw-r--r-- | arch/arm/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 59ff42ddf0ae..cf73a7f742dd 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -12,7 +12,7 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ strchr.o strrchr.o \ testchangebit.o testclearbit.o testsetbit.o \ ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ - ucmpdi2.o lib1funcs.o div64.o sha1.o \ + ucmpdi2.o lib1funcs.o div64.o \ io-readsb.o io-writesb.o io-readsl.o io-writesl.o mmu-y := clear_user.o copy_page.o getuser.o putuser.o |