Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[firefly-linux-kernel-4.4.55.git] / arch / s390 / oprofile / Makefile

diff --git a/arch/s390/oprofile/Makefile b/arch/s390/oprofile/Makefile
index 524c4b615821acaf6139c9a8f7c8646a4d88e49d..1bd23017191e86fb528257d30cbc3e60e8339a5b 100644 (file)
--- a/arch/s390/oprofile/Makefile
+++ b/arch/s390/oprofile/Makefile
@@ -7,4 +7,4 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
                timer_int.o )
 
 oprofile-y :=  $(DRIVER_OBJS) init.o backtrace.o
-oprofile-$(CONFIG_64BIT)       += hwsampler.o
+oprofile-y +=  hwsampler.o