diff options
| author | Colin Cross <ccross@android.com> | 2010-04-25 00:29:07 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-05-05 20:25:12 -0700 |
| commit | 790dbc022bc62af2ee4188f9f0e38911a3032628 (patch) | |
| tree | 611cdee0c331c7d6c841d031e03faa06c27c028c /arch/arm/lib | |
| parent | f6cdcdad7e0625ed48b53a5369fc0735c9cf9d63 (diff) | |
[ARM] Add ARCH_PROVIDES_UDELAY config option
Change-Id: I93ded376b6b6eb4b16a9c5e1984e6753c0a8e0a1
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 030ba7219f48..aa449e3c7da3 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -6,7 +6,7 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ csumpartialcopy.o csumpartialcopyuser.o clearbit.o \ - delay.o findbit.o memchr.o memcpy.o \ + findbit.o memchr.o memcpy.o \ memmove.o memset.o memzero.o setbit.o \ strncpy_from_user.o strnlen_user.o \ strchr.o strrchr.o \ @@ -17,6 +17,10 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ mmu-y := clear_user.o copy_page.o getuser.o putuser.o +ifneq ($(CONFIG_ARCH_PROVIDES_UDELAY),y) + lib-y += delay.o +endif + # the code in uaccess.S is not preemption safe and # probably faster on ARMv3 only ifeq ($(CONFIG_PREEMPT),y) |