diff options
author | Len Brown <len.brown@intel.com> | 2005-09-08 09:45:47 +0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-09-08 09:45:47 +0400 |
commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/m68k/lib/Makefile | |
parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
download | linux-64e47488c913ac704d465a6af86a26786d1412a5.tar.xz |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/m68k/lib/Makefile')
-rw-r--r-- | arch/m68k/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile index 34b6dbc29c85..ebe51a513817 100644 --- a/arch/m68k/lib/Makefile +++ b/arch/m68k/lib/Makefile @@ -5,4 +5,4 @@ EXTRA_AFLAGS := -traditional lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ - checksum.o memcmp.o memcpy.o memset.o semaphore.o + checksum.o string.o semaphore.o |