diff options
| author | Heinz Graalfs <graalfs@linux.vnet.ibm.com> | 2011-02-15 13:02:14 -0500 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2011-03-16 14:05:35 +0100 |
| commit | c814d160f61466ea6d4491bb4e8e548856e27a58 (patch) | |
| tree | 8cae1f71911a09a61dfdd40a9e346dbc6fcd46ab /arch/s390/oprofile/Makefile | |
| parent | 7bb2e269aefe4539313922ab4a89367cd52a51d1 (diff) | |
| download | linux-c814d160f61466ea6d4491bb4e8e548856e27a58.tar.bz2 | |
oprofile, s390: Remove hwsampler_files.c and merge it into init.c
Merge the contents of hwsampler_files.c into
arch/s390/oprofile/init.c.
Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/s390/oprofile/Makefile')
| -rw-r--r-- | arch/s390/oprofile/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/oprofile/Makefile b/arch/s390/oprofile/Makefile index 00d8fc8e4429..d698cddcfbdd 100644 --- a/arch/s390/oprofile/Makefile +++ b/arch/s390/oprofile/Makefile @@ -6,4 +6,4 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ oprofilefs.o oprofile_stats.o \ timer_int.o ) -oprofile-y := $(DRIVER_OBJS) init.o backtrace.o hwsampler.o hwsampler_files.o +oprofile-y := $(DRIVER_OBJS) init.o backtrace.o hwsampler.o |