diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-02 22:41:36 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-02 22:41:36 +0100 |
commit | 923a789b49c7269a0245d5af6afe486188d940df (patch) | |
tree | c3f168427372e64f7467a794f313416da5086ba0 /arch/sparc64/oprofile/Makefile | |
parent | x86: mpparse.c fix style problems (diff) | |
parent | Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
download | linux-923a789b49c7269a0245d5af6afe486188d940df.tar.xz linux-923a789b49c7269a0245d5af6afe486188d940df.zip |
Merge branch 'linus' into x86/cleanups
Conflicts:
arch/x86/kernel/reboot.c
Diffstat (limited to 'arch/sparc64/oprofile/Makefile')
-rw-r--r-- | arch/sparc64/oprofile/Makefile | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/sparc64/oprofile/Makefile b/arch/sparc64/oprofile/Makefile deleted file mode 100644 index e9feca1ca28b..000000000000 --- a/arch/sparc64/oprofile/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -obj-$(CONFIG_OPROFILE) += oprofile.o - -DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ - oprof.o cpu_buffer.o buffer_sync.o \ - event_buffer.o oprofile_files.o \ - oprofilefs.o oprofile_stats.o \ - timer_int.o ) - -oprofile-y := $(DRIVER_OBJS) init.o |