diff options
-rw-r--r-- | include/div64.h (renamed from include/asm-avr32/div64.h) | 0 | ||||
-rw-r--r-- | lib_avr32/Makefile | 2 | ||||
-rw-r--r-- | lib_generic/Makefile | 2 | ||||
-rw-r--r-- | lib_generic/div64.c (renamed from lib_avr32/div64.c) | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-avr32/div64.h b/include/div64.h index 2e0ba8389e1..2e0ba8389e1 100644 --- a/include/asm-avr32/div64.h +++ b/include/div64.h diff --git a/lib_avr32/Makefile b/lib_avr32/Makefile index cf20836023f..bb2938fe5c2 100644 --- a/lib_avr32/Makefile +++ b/lib_avr32/Makefile @@ -29,7 +29,7 @@ LIB = $(obj)lib$(ARCH).a SOBJS = memset.o -COBJS = board.o interrupts.o avr32_linux.o div64.o +COBJS = board.o interrupts.o avr32_linux.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/lib_generic/Makefile b/lib_generic/Makefile index b2091c5e78b..bf377529c20 100644 --- a/lib_generic/Makefile +++ b/lib_generic/Makefile @@ -27,7 +27,7 @@ LIB = $(obj)libgeneric.a COBJS = bzlib.o bzlib_crctable.o bzlib_decompress.o \ bzlib_randtable.o bzlib_huffman.o \ - crc32.o ctype.o display_options.o ldiv.o sha1.o \ + crc32.o ctype.o display_options.o div64.o ldiv.o sha1.o \ string.o vsprintf.o zlib.o SRCS := $(COBJS:.o=.c) diff --git a/lib_avr32/div64.c b/lib_generic/div64.c index 99726e325da..d9951b597f9 100644 --- a/lib_avr32/div64.c +++ b/lib_generic/div64.c @@ -18,8 +18,6 @@ #include <linux/types.h> -#include <asm/div64.h> - uint32_t __div64_32(uint64_t *n, uint32_t base) { uint64_t rem = *n; |